Changeset 89921 in webkit

Timestamp:

Jun 28, 2011 4:42:33 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

2011-06-28 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[X11][WK2] X error with plugin tests
​https://bugs.webkit.org/show_bug.cgi?id=63520

• platform/qt-wk2/Skipped:

2011-06-28 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[X11][WK2] X error with plugin tests
​https://bugs.webkit.org/show_bug.cgi?id=63520

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: Never create a pixmap with (0,0) dimensions. (WebKit::NetscapePlugin::platformGeometryDidChange): (WebKit::NetscapePlugin::platformPaint):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [X11][WK2] X error with plugin tests
+        https://bugs.webkit.org/show_bug.cgi?id=63520
+
+        * platform/qt-wk2/Skipped:
+
 2011-06-28  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -1497 +1497 @@
 plugins/npp-set-window-called-during-destruction.html
 plugins/reloadplugins-and-pages.html
-plugins/destroy-stream-twice.html
-plugins/object-embed-plugin-scripting.html
-plugins/npruntime/npruntime.html
 
 # Unexplained failures

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [X11][WK2] X error with plugin tests
+        https://bugs.webkit.org/show_bug.cgi?id=63520
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        Never create a pixmap with (0,0) dimensions.
+        (WebKit::NetscapePlugin::platformGeometryDidChange):
+        (WebKit::NetscapePlugin::platformPaint):
+
 2011-06-28  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -210 +210 @@
         XFreePixmap(display, m_drawable);
 
+    if (m_frameRect.isEmpty()) {
+        m_drawable = 0;
+        return;
+    }
+
     m_drawable = XCreatePixmap(display, rootWindowID(), m_frameRect.width(), m_frameRect.height(), displayDepth());
 
@@ -232 +237 @@
     }
 
-    if (context->paintingDisabled())
+    if (context->paintingDisabled() || !m_drawable)
         return;
-
-    ASSERT(m_drawable);
 
 #if PLATFORM(QT)