Diff
Modified: trunk/Source/WebKit2/ChangeLog (99241 => 99242)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 23:17:34 UTC (rev 99241)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 23:17:39 UTC (rev 99242)
@@ -1,5 +1,24 @@
2011-11-03 Anders Carlsson <[email protected]>
+ Get rid of PluginControllerProxy::m_frameRectInWindowCoordinates
+ https://bugs.webkit.org/show_bug.cgi?id=71506
+
+ Reviewed by Darin Adler.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::geometryDidChange):
+ This no longer needs to take the frame rect in window coordinates.
+
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in:
+ Remove frameRectInWindowCoordinates from the GeometryDidChange message.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::geometryDidChange):
+ Don't pass frameRectInWindowCoordinates when sending GeometryDidChange.
+
+2011-11-03 Anders Carlsson <[email protected]>
+
Get rid of Plugin::wantsWindowRelativeCoordinates()
https://bugs.webkit.org/show_bug.cgi?id=71504
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (99241 => 99242)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-11-03 23:17:34 UTC (rev 99241)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-11-03 23:17:39 UTC (rev 99242)
@@ -429,12 +429,11 @@
m_plugin->frameDidFail(requestID, wasCancelled);
}
-void PluginControllerProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform, const IntRect& frameRectInWindowCoordinates, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle)
+void PluginControllerProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle)
{
ASSERT(m_plugin);
m_pluginSize = pluginSize;
- m_frameRectInWindowCoordinates = frameRectInWindowCoordinates;
if (contentsScaleFactor != m_contentsScaleFactor) {
m_contentsScaleFactor = contentsScaleFactor;
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (99241 => 99242)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2011-11-03 23:17:34 UTC (rev 99241)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2011-11-03 23:17:39 UTC (rev 99242)
@@ -113,7 +113,7 @@
// Message handlers.
void frameDidFinishLoading(uint64_t requestID);
void frameDidFail(uint64_t requestID, bool wasCancelled);
- void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform, const WebCore::IntRect& frameRectInWindowCoordinates, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle);
+ void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle);
void didEvaluateJavaScript(uint64_t requestID, const String& result);
void streamDidReceiveResponse(uint64_t streamID, const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
void streamDidReceiveData(uint64_t streamID, const CoreIPC::DataReference& data);
@@ -163,10 +163,6 @@
WebCore::IntSize m_pluginSize;
- // The plug-in frame rect in window coordinates.
- // FIXME: Remove this.
- WebCore::IntRect m_frameRectInWindowCoordinates;
-
// The dirty rect in plug-in coordinates.
WebCore::IntRect m_dirtyRect;
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (99241 => 99242)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2011-11-03 23:17:34 UTC (rev 99241)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2011-11-03 23:17:39 UTC (rev 99242)
@@ -24,7 +24,7 @@
messages -> PluginControllerProxy {
# Sent when the plug-in geometry changes.
- GeometryDidChange(WebCore::IntSize pluginSize, WebCore::IntRect clipRect, WebCore::AffineTransform pluginToRootViewTransform, WebCore::IntRect frameRectInWindowCoordinates, float scaleFactor, WebKit::ShareableBitmap::Handle backingStoreHandle)
+ GeometryDidChange(WebCore::IntSize pluginSize, WebCore::IntRect clipRect, WebCore::AffineTransform pluginToRootViewTransform, float scaleFactor, WebKit::ShareableBitmap::Handle backingStoreHandle)
# Sent when a frame has finished loading.
FrameDidFinishLoading(uint64_t requestID)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (99241 => 99242)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-11-03 23:17:34 UTC (rev 99241)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-11-03 23:17:39 UTC (rev 99242)
@@ -175,12 +175,9 @@
{
ASSERT(m_isStarted);
- IntPoint frameRectLocationInWindowCoordinates = m_pluginToRootViewTransform.mapPoint(IntPoint());
- IntRect frameRectInWindowCoordinates = IntRect(frameRectLocationInWindowCoordinates, m_pluginSize);
-
if (m_pluginSize.isEmpty() || !needsBackingStore()) {
ShareableBitmap::Handle pluginBackingStoreHandle;
- m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, frameRectInWindowCoordinates, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
return;
}
@@ -201,7 +198,7 @@
m_pluginBackingStoreContainsValidData = false;
}
- m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, frameRectInWindowCoordinates, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+ m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
void PluginProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
