Title: [89678] trunk/Source/WebKit2
- Revision
- 89678
- Author
- carlo...@webkit.org
- Date
- 2011-06-24 09:26:59 -0700 (Fri, 24 Jun 2011)
Log Message
2011-06-24 Carlos Garcia Campos <cgar...@igalia.com>
Reviewed by Martin Robinson.
[X11] Do not call NPP_SetWindow with a null window handle on destroy
https://bugs.webkit.org/show_bug.cgi?id=62981
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::destroy):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (89677 => 89678)
--- trunk/Source/WebKit2/ChangeLog 2011-06-24 16:09:26 UTC (rev 89677)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-24 16:26:59 UTC (rev 89678)
@@ -1,3 +1,13 @@
+2011-06-24 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [X11] Do not call NPP_SetWindow with a null window handle on destroy
+ https://bugs.webkit.org/show_bug.cgi?id=62981
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::destroy):
+
2011-06-23 Jamie Cooley <james.coo...@nokia.com>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (89677 => 89678)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-24 16:09:26 UTC (rev 89677)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-06-24 16:26:59 UTC (rev 89678)
@@ -513,7 +513,7 @@
// Stop all streams.
stopAllStreams();
-#if !PLUGIN_ARCHITECTURE(MAC)
+#if !PLUGIN_ARCHITECTURE(MAC) && !PLUGIN_ARCHITECTURE(X11)
m_npWindow.window = 0;
callSetWindow();
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
