Changeset 201921 in webkit

Timestamp:

Jun 10, 2016 5:50:14 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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-09  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp

@@ -52 +52 @@
 #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;
 }