Diff
Modified: trunk/Source/WebKit2/ChangeLog (99106 => 99107)
--- trunk/Source/WebKit2/ChangeLog 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-02 22:26:15 UTC (rev 99107)
@@ -1,5 +1,25 @@
2011-11-02 Anders Carlsson <[email protected]>
+ Get rid of Plugin::deprecatedGeometryDidChange
+ https://bugs.webkit.org/show_bug.cgi?id=71411
+
+ Reviewed by Sam Weinig.
+
+ Now that all Plugin subclasses implement geometryDidChange and do all the work there
+ we can get rid of deprecatedGeometryDidChange.
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::viewGeometryDidChange):
+
+2011-11-02 Anders Carlsson <[email protected]>
+
Move back functions that were not added.
* UIProcess/API/C/WKPage.h:
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-11-02 22:26:15 UTC (rev 99107)
@@ -670,22 +670,6 @@
return m_isTransparent;
}
-void NetscapePlugin::deprecatedGeometryDidChange(const IntRect& frameRectInWindowCoordinates, const IntRect& clipRectInWindowCoordinates)
-{
- ASSERT(m_isStarted);
-
- if (m_frameRectInWindowCoordinates == frameRectInWindowCoordinates && m_clipRectInWindowCoordinates == clipRectInWindowCoordinates) {
- // Nothing to do.
- return;
- }
-
- m_frameRectInWindowCoordinates = frameRectInWindowCoordinates;
- m_clipRectInWindowCoordinates = clipRectInWindowCoordinates;
-
- platformGeometryDidChange();
- callSetWindow();
-}
-
void NetscapePlugin::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
{
ASSERT(m_isStarted);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-11-02 22:26:15 UTC (rev 99107)
@@ -169,7 +169,6 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-11-02 22:26:15 UTC (rev 99107)
@@ -366,11 +366,6 @@
return false;
}
-void BuiltInPDFView::deprecatedGeometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
-{
- ASSERT_NOT_REACHED();
-}
-
void BuiltInPDFView::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
{
if (m_pluginSize == pluginSize) {
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-11-02 22:26:15 UTC (rev 99107)
@@ -77,7 +77,6 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2011-11-02 22:26:15 UTC (rev 99107)
@@ -117,9 +117,6 @@
// Returns whether the plug-in is transparent or not.
virtual bool isTransparent() = 0;
- // Tells the plug-in that either the plug-ins frame rect or its clip rect has changed. Both rects are in window coordinates.
- virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect) = 0;
-
// Tells the plug-in that its geometry has changed. The clip rect is in plug-in coordinates, and the affine transform can be used
// to convert from root view coordinates to plug-in coordinates.
virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) = 0;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-11-02 22:26:15 UTC (rev 99107)
@@ -204,11 +204,6 @@
m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_pluginSize, m_clipRect, m_pluginToRootViewTransform, frameRectInWindowCoordinates, contentsScaleFactor(), pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
-void PluginProxy::deprecatedGeometryDidChange(const IntRect&, const IntRect&)
-{
- ASSERT_NOT_REACHED();
-}
-
void PluginProxy::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform)
{
if (pluginSize == m_pluginSize && m_clipRect == clipRect && m_pluginToRootViewTransform == pluginToRootViewTransform) {
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-11-02 22:26:15 UTC (rev 99107)
@@ -72,7 +72,6 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRectInWindowCoordinates, const WebCore::IntRect& clipRectInWindowCoordinates);
virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (99106 => 99107)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-11-02 22:25:56 UTC (rev 99106)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-11-02 22:26:15 UTC (rev 99107)
@@ -716,12 +716,6 @@
if (!m_isInitialized || !m_plugin || !parent())
return;
- if (m_plugin->wantsWindowRelativeCoordinates()) {
- // Get the frame rect in window coordinates.
- IntRect rect = parent()->contentsToWindow(frameRect());
- m_plugin->deprecatedGeometryDidChange(rect, clipRectInWindowCoordinates());
- }
-
// FIXME: Just passing a translation matrix isn't good enough.
IntPoint locationInWindowCoordinates = parent()->contentsToRootView(frameRect().location());
AffineTransform transform = AffineTransform::translation(locationInWindowCoordinates.x(), locationInWindowCoordinates.y());
