Title: [175951] releases/WebKitGTK/webkit-2.6/Source/WebKit2
- Revision
- 175951
- Author
- [email protected]
- Date
- 2014-11-11 09:44:16 -0800 (Tue, 11 Nov 2014)
Log Message
Merge r175696 - [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: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (175950 => 175951)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-11 17:42:03 UTC (rev 175950)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-11 17:44:16 UTC (rev 175951)
@@ -1,3 +1,18 @@
+2014-11-06 Alberto Garcia <[email protected]>
+
+ [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-05 Alberto Garcia <[email protected]>
NetscapePlugin: NPP_GetValue should receive a pointer to NPBool, not bool
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (175950 => 175951)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-11-11 17:42:03 UTC (rev 175950)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-11-11 17:44:16 UTC (rev 175951)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
