Title: [175950] releases/WebKitGTK/webkit-2.6/Source/WebKit2
- Revision
- 175950
- Author
- [email protected]
- Date
- 2014-11-11 09:42:03 -0800 (Tue, 11 Nov 2014)
Log Message
Merge r175619 - NetscapePlugin: NPP_GetValue should receive a pointer to NPBool, not bool
https://bugs.webkit.org/show_bug.cgi?id=138418
Reviewed by Carlos Garcia Campos.
Replace bool with NPBool, which is actually an unsigned char.
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::NetscapePlugin::platformPostInitialize):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (175949 => 175950)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-11 17:40:07 UTC (rev 175949)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-11 17:42:03 UTC (rev 175950)
@@ -1,3 +1,15 @@
+2014-11-05 Alberto Garcia <[email protected]>
+
+ NetscapePlugin: NPP_GetValue should receive a pointer to NPBool, not bool
+ https://bugs.webkit.org/show_bug.cgi?id=138418
+
+ Reviewed by Carlos Garcia Campos.
+
+ Replace bool with NPBool, which is actually an unsigned char.
+
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+ (WebKit::NetscapePlugin::platformPostInitialize):
+
2014-10-28 Ting-Wei Lan <[email protected]>
Cast std::chrono::duration.count() to int64_t in ArgumentCoder
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (175949 => 175950)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-11-11 17:40:07 UTC (rev 175949)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-11-11 17:42:03 UTC (rev 175950)
@@ -202,7 +202,7 @@
bool NetscapePlugin::platformPostInitialize()
{
uint64_t windowID = 0;
- bool needsXEmbed = false;
+ NPBool needsXEmbed = false;
if (m_isWindowed) {
NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);
if (needsXEmbed) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
