diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/plugins/symbian | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/plugins/symbian')
-rw-r--r-- | Source/WebCore/plugins/symbian/PluginViewSymbian.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp index 1a9a9ca..13aa60f 100644 --- a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -102,12 +102,7 @@ void PluginView::updatePluginWidget() if (m_windowRect == oldWindowRect && m_clipRect == oldClipRect) return; - // in order to move/resize the plugin window at the same time as the rest of frame - // during e.g. scrolling, we set the mask and 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())) - setNPWindowIfNeeded(); + setNPWindowIfNeeded(); } void PluginView::setFocus(bool focused) |