diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 22:05:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 22:05:29 +0200 |
| commit | 0bb233d1f7c4317bb772d72cc3f92cbcdb4027de (patch) | |
| tree | 47b40aab26fdaa15ec446b7d6de9bdf7efd7bbbb /Source/WebKit2/WebProcess/Plugins/Netscape | |
| parent | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (diff) | |
| download | qtwebkit-0bb233d1f7c4317bb772d72cc3f92cbcdb4027de.tar.gz | |
Imported WebKit commit f2da9451cbccb8b7921d55483aa0bc656ff9cf53 (http://svn.webkit.org/repository/webkit/trunk@119269)
New snapshot that includes fix for using -Werror only in developer builds
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Netscape')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp | 10 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp index 2b91038d9..4d82cff01 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp @@ -71,6 +71,7 @@ NetscapePlugin::NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule) , m_isTransparent(false) , m_inNPPNew(false) , m_shouldUseManualLoader(false) + , m_hasCalledSetWindow(false) , m_nextTimerID(0) #if PLATFORM(MAC) , m_drawingModel(static_cast<NPDrawingModel>(-1)) @@ -506,6 +507,7 @@ void NetscapePlugin::callSetWindow() m_npWindow.clipRect.bottom = m_npWindow.clipRect.top + m_clipRect.height(); NPP_SetWindow(&m_npWindow); + m_hasCalledSetWindow = true; } bool NetscapePlugin::shouldLoadSrcURL() @@ -692,11 +694,11 @@ void NetscapePlugin::geometryDidChange(const IntSize& pluginSize, const IntRect& return; } - bool shouldCallWindow = true; + bool shouldCallSetWindow = true; // If the plug-in doesn't want window relative coordinates, we don't need to call setWindow unless its size or clip rect changes. - if (wantsPluginRelativeNPWindowCoordinates() && m_pluginSize == pluginSize && m_clipRect == clipRect) - shouldCallWindow = false; + if (m_hasCalledSetWindow && wantsPluginRelativeNPWindowCoordinates() && m_pluginSize == pluginSize && m_clipRect == clipRect) + shouldCallSetWindow = false; m_pluginSize = pluginSize; m_clipRect = clipRect; @@ -707,7 +709,7 @@ void NetscapePlugin::geometryDidChange(const IntSize& pluginSize, const IntRect& platformGeometryDidChange(); - if (!shouldCallWindow) + if (!shouldCallSetWindow) return; callSetWindow(); diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index 9194984b3..1c49c6032 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -272,6 +272,8 @@ private: bool m_isTransparent; bool m_inNPPNew; bool m_shouldUseManualLoader; + bool m_hasCalledSetWindow; + RefPtr<NetscapePluginStream> m_manualStream; Vector<bool, 8> m_popupEnabledStates; |