Title: [175696] trunk/Source/WebKit2
Revision
175696
Author
be...@igalia.com
Date
2014-11-06 07:46:34 -0800 (Thu, 06 Nov 2014)

Log Message

[GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
https://bugs.webkit.org/show_bug.cgi?id=137849

Reviewed by Carlos Garcia Campos.

NPPVpluginNeedsXEmbed is a boolean value, so it should normally
use an NPBool (1 byte). However some plugins (the Flash player in
particular) are using an int instead, so we have to do it as well
else we'll end up corrupting the stack.

* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::NetscapePlugin::platformPostInitialize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (175695 => 175696)


--- trunk/Source/WebKit2/ChangeLog	2014-11-06 15:22:15 UTC (rev 175695)
+++ trunk/Source/WebKit2/ChangeLog	2014-11-06 15:46:34 UTC (rev 175696)
@@ -1,3 +1,18 @@
+2014-11-06  Alberto Garcia  <be...@igalia.com>
+
+        [GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
+        https://bugs.webkit.org/show_bug.cgi?id=137849
+
+        Reviewed by Carlos Garcia Campos.
+
+        NPPVpluginNeedsXEmbed is a boolean value, so it should normally
+        use an NPBool (1 byte). However some plugins (the Flash player in
+        particular) are using an int instead, so we have to do it as well
+        else we'll end up corrupting the stack.
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::NetscapePlugin::platformPostInitialize):
+
 2014-11-06  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Add context menu API to Web Process Extensions

Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (175695 => 175696)


--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp	2014-11-06 15:22:15 UTC (rev 175695)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp	2014-11-06 15:46:34 UTC (rev 175696)
@@ -202,7 +202,9 @@
 bool NetscapePlugin::platformPostInitialize()
 {
     uint64_t windowID = 0;
-    NPBool needsXEmbed = false;
+    // NPPVpluginNeedsXEmbed is a boolean value, but at least the
+    // Flash player plugin is using an 'int' instead.
+    int needsXEmbed = 0;
     if (m_isWindowed) {
         NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);
         if (needsXEmbed) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to