Changeset 83624 in webkit

Timestamp:

Apr 12, 2011 12:45:15 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-12 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Call PluginControllerProxy::platformGeometryDidChange before Plugin::geometryDidChange
​https://bugs.webkit.org/show_bug.cgi?id=58361

Since Plugin::geometryDidChange ends up calling plug-in code it can resize the plug-in which causes
platformGeometryDidChange to be called with the wrong rect.

• PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::geometryDidChange): Call platformGeometryDidChange.

• PluginProcess/PluginControllerProxy.h:
• PluginProcess/mac/PluginControllerProxyMac.mm: (WebKit::PluginControllerProxy::platformGeometryDidChange): Remove the parameters to platformGeometryDidChange and just use m_frameRect instead.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (2 diffs)
• PluginProcess/PluginControllerProxy.h (modified) (1 diff)
• PluginProcess/mac/PluginControllerProxyMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-12  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Call PluginControllerProxy::platformGeometryDidChange before Plugin::geometryDidChange
+        https://bugs.webkit.org/show_bug.cgi?id=58361
+
+        Since Plugin::geometryDidChange ends up calling plug-in code it can resize the plug-in which causes
+        platformGeometryDidChange to be called with the wrong rect.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::geometryDidChange):
+        Call platformGeometryDidChange.
+
+        * PluginProcess/PluginControllerProxy.h:
+        * PluginProcess/mac/PluginControllerProxyMac.mm:
+        (WebKit::PluginControllerProxy::platformGeometryDidChange):
+        Remove the parameters to platformGeometryDidChange and just use m_frameRect instead.
+
 2011-04-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -368 +368 @@
     ASSERT(m_plugin);
 
+    platformGeometryDidChange();
+
     if (!backingStoreHandle.isNull()) {
         // Create a new backing store.
@@ -374 +376 @@
 
     m_plugin->geometryDidChange(frameRect, clipRect);
-
-    platformGeometryDidChange(frameRect, clipRect);
 }
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -138 +138 @@
     void platformInitialize();
     void platformDestroy();
-    void platformGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
+    void platformGeometryDidChange();
 
     WebProcessConnection* m_connection;

trunk/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm

@@ -68 +68 @@
 }
 
-void PluginControllerProxy::platformGeometryDidChange(const IntRect& frameRect, const IntRect&)
+void PluginControllerProxy::platformGeometryDidChange()
 {
     CALayer * pluginLayer = m_plugin->pluginLayer();
@@ -75 +75 @@
     [CATransaction begin];
     [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
-    [pluginLayer setFrame:CGRectMake(0, 0, frameRect.width(), frameRect.height())];
+    [pluginLayer setFrame:CGRectMake(0, 0, m_frameRect.width(), m_frameRect.height())];
     [CATransaction commit];
 }