Title: [204811] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 204811
- Author
- [email protected]
- Date
- 2016-08-23 04:38:32 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r201921 - [GTK] Browser plugins crash under Wayland
https://bugs.webkit.org/show_bug.cgi?id=157605
Reviewed by Michael Catanzaro.
Fail the initialization of windowed plugins if we don't have a platform implementation.
* WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp:
(WebKit::NetscapePlugin::platformPostInitialize):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (204810 => 204811)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-08-23 11:36:55 UTC (rev 204810)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-08-23 11:38:32 UTC (rev 204811)
@@ -1,3 +1,15 @@
+2016-06-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Browser plugins crash under Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=157605
+
+ Reviewed by Michael Catanzaro.
+
+ Fail the initialization of windowed plugins if we don't have a platform implementation.
+
+ * WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp:
+ (WebKit::NetscapePlugin::platformPostInitialize):
+
2016-06-07 Michael Catanzaro <[email protected]>
[GTK] Hide GTK+ 2 plugins if GTK+ 2 plugin process was built but is not installed
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp (204810 => 204811)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp 2016-08-23 11:36:55 UTC (rev 204810)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp 2016-08-23 11:38:32 UTC (rev 204811)
@@ -51,13 +51,14 @@
}
#endif
- if (m_impl) {
- m_npWindow.type = m_impl->windowType();
- m_npWindow.window = m_impl->window();
- m_npWindow.ws_info = m_impl->windowSystemInfo();
- callSetWindow();
- }
+ // Windowed plugins need a platform implementation.
+ if (!m_impl)
+ return !m_isWindowed;
+ m_npWindow.type = m_impl->windowType();
+ m_npWindow.window = m_impl->window();
+ m_npWindow.ws_info = m_impl->windowSystemInfo();
+ callSetWindow();
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
