Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 6 insertions, 2 deletions

diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
index dcb805a..f39da85 100644
--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
@@ -182,7 +182,7 @@ void PluginView::updatePluginWidget()
         // Note that we don't invalidate the frameRect() here. This is because QWebFrame::renderRelativeCoords()
         // imitates ScrollView and adds the scroll offset back on to the rect we damage here (making the co-ordinates absolute
         // to the frame again) before passing it to FrameView.
-        frameView->invalidateRect(m_windowRect);
+        invalidate();
     }
 }
 
@@ -812,8 +812,12 @@ void PluginView::invalidateRect(const IntRect& rect)
 #endif
 
     if (m_isWindowed) {
-        if (platformWidget())
+        if (platformWidget()) {
+            // update() will schedule a repaint of the widget so ensure
+            // its knowledge of its position on the page is up to date.
+            platformWidget()->setGeometry(m_windowRect);
             platformWidget()->update(rect);
+        }
         return;
     }