Changeset 61311 in webkit

Timestamp:

Jun 17, 2010 12:33:11 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-17 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] NPP_SetWindow seems to not be called when TestNetscapePlugin is moved

​https://bugs.webkit.org/show_bug.cgi?id=36702

setNPWindowIfNeeded() is called on paint() in PluginViewQt, which doesn't
work for DRT. So call it if we are in DRT mode and the window geometry
has changed.

Unskips plugins/reentrant-update-widget-positions.html

• platform/qt/Skipped:

2010-06-17 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] NPP_SetWindow seems to not be called when TestNetscapePlugin is moved

​https://bugs.webkit.org/show_bug.cgi?id=36702

setNPWindowIfNeeded() is called on paint() in PluginViewQt, which doesn't
work for DRT. So call it if we are in DRT mode and the window geometry
has changed.

Unskips plugins/reentrant-update-widget-positions.html

• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::updatePluginWidget):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/qt/PluginViewQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-17  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] NPP_SetWindow seems to not be called when TestNetscapePlugin is moved
+
+        https://bugs.webkit.org/show_bug.cgi?id=36702
+
+        setNPWindowIfNeeded() is called on paint() in PluginViewQt, which doesn't
+        work for DRT. So call it if we are in DRT mode and the window geometry
+        has changed.
+
+        Unskips plugins/reentrant-update-widget-positions.html
+
+        * platform/qt/Skipped:
+
 2010-06-16  Hayato Ito  <hayato@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -429 +429 @@
 plugins/geturlnotify-during-document-teardown.html
 
-# ---- https://bugs.webkit.org/show_bug.cgi?id=36702
-plugins/reentrant-update-widget-positions.html
 # ---- plugins rendered in incorrect position
 plugins/embed-attributes-style.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-17  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] NPP_SetWindow seems to not be called when TestNetscapePlugin is moved
+
+        https://bugs.webkit.org/show_bug.cgi?id=36702
+
+        setNPWindowIfNeeded() is called on paint() in PluginViewQt, which doesn't
+        work for DRT. So call it if we are in DRT mode and the window geometry
+        has changed.
+
+        Unskips plugins/reentrant-update-widget-positions.html
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::updatePluginWidget):
+
 2010-06-17  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -61 +61 @@
 #include "Settings.h"
 #include "npruntime_impl.h"
+#include "qwebpage_p.h"
 #include "runtime_root.h"
 
@@ -122 +123 @@
     m_hasPendingGeometryChange = true;
 
-    // in order to move/resize the plugin window at the same time as the
+    // (i) in order to move/resize the plugin window at the same time as the
     // rest of frame during e.g. scrolling, we set the window geometry
     // in the paint() function, but as paint() isn't called when the
     // plugin window is outside the frame which can be caused by a
     // scroll, we need to move/resize immediately.
-    if (!m_windowRect.intersects(frameView->frameRect()))
+    // (ii) if we are running layout tests from DRT, paint() won't ever get called
+    // so we need to call setNPWindowIfNeeded() if window geometry has changed
+    if (!m_windowRect.intersects(frameView->frameRect())
+        || (QWebPagePrivate::drtRun && platformPluginWidget() && (m_windowRect != oldWindowRect || m_clipRect != oldClipRect)))
         setNPWindowIfNeeded();