Title: [90146] releases/WebKitGTK/webkit-1.4/Source/WebCore
Diff
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (90145 => 90146)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-30 19:18:18 UTC (rev 90145)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-30 19:25:16 UTC (rev 90146)
@@ -1,3 +1,16 @@
+2011-06-30 Martin Robinson <[email protected]>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Windowless plugins sometimes crash with a BadMatch error
+ https://bugs.webkit.org/show_bug.cgi?id=63020
+
+ Do not try to create an XPixmap with any of the dimensions as zero.
+
+ * plugins/gtk/PluginViewGtk.cpp:
+ (WebCore::PluginView::updatePluginWidget): Guard against and empty window rect
+ before trying to create a windowless plugin pixmap.
+
2011-06-30 Joseph Pecoraro <[email protected]>
Reviewed by David Kilzer.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/gtk/PluginViewGtk.cpp (90145 => 90146)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-06-30 19:18:18 UTC (rev 90145)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-06-30 19:25:16 UTC (rev 90146)
@@ -139,7 +139,7 @@
return;
#if defined(XP_UNIX)
- if (!m_isWindowed) {
+ if (!m_isWindowed && !m_windowRect.isEmpty()) {
Display* display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
if (m_drawable)
XFreePixmap(display, m_drawable);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
