Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 21:43:11 UTC (rev 102270)
@@ -1,5 +1,33 @@
2011-12-07 Lucas Forschler <[email protected]>
+ Merge 98646
+
+ 2011-10-27 Anders Carlsson <[email protected]>
+
+ Rename Plugin::geometryDidChange to Plugin::deprecatedGeometryDidChange
+ https://bugs.webkit.org/show_bug.cgi?id=71065
+
+ Reviewed by Simon Fraser.
+
+ In preparation for adding a version of geometryDidChange that doesn't take window coordinates.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::geometryDidChange):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::deprecatedGeometryDidChange):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+ (WebKit::BuiltInPDFView::deprecatedGeometryDidChange):
+ * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::deprecatedGeometryDidChange):
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::viewGeometryDidChange):
+
+2011-12-07 Lucas Forschler <[email protected]>
+
Merge 98438
2011-10-26 Ryosuke Niwa <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 21:43:11 UTC (rev 102270)
@@ -465,7 +465,7 @@
m_backingStore = ShareableBitmap::create(backingStoreHandle);
}
- m_plugin->geometryDidChange(frameRect, clipRect);
+ m_plugin->deprecatedGeometryDidChange(frameRect, clipRect);
}
void PluginControllerProxy::didEvaluateJavaScript(uint64_t requestID, const String& result)
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-12-07 21:43:11 UTC (rev 102270)
@@ -559,7 +559,7 @@
return m_isTransparent;
}
-void NetscapePlugin::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
+void NetscapePlugin::deprecatedGeometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
{
ASSERT(m_isStarted);
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2011-12-07 21:43:11 UTC (rev 102270)
@@ -155,7 +155,7 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
+ virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-12-07 21:43:11 UTC (rev 102270)
@@ -377,7 +377,7 @@
return false;
}
-void BuiltInPDFView::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
+void BuiltInPDFView::deprecatedGeometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
{
if (m_frameRect == frameRect) {
// Nothing to do.
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h 2011-12-07 21:43:11 UTC (rev 102270)
@@ -79,7 +79,7 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
+ virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h 2011-12-07 21:43:11 UTC (rev 102270)
@@ -101,7 +101,7 @@
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 geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect) = 0;
+ virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect) = 0;
// Tells the plug-in that it has been explicitly hidden or shown. (Note that this is not called when the plug-in becomes obscured from view on screen.)
virtual void visibilityDidChange() = 0;
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-12-07 21:43:11 UTC (rev 102270)
@@ -241,7 +241,7 @@
m_connection->connection()->send(Messages::PluginControllerProxy::GeometryDidChange(m_frameRect, m_clipRect, contentsScaleFactor, pluginBackingStoreHandle), m_pluginInstanceID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
-void PluginProxy::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
+void PluginProxy::deprecatedGeometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
{
m_frameRect = frameRect;
m_clipRect = clipRect;
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2011-12-07 21:43:11 UTC (rev 102270)
@@ -71,7 +71,7 @@
virtual PlatformLayer* pluginLayer();
#endif
virtual bool isTransparent();
- virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
+ virtual void deprecatedGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
virtual void visibilityDidChange();
virtual void frameDidFinishLoading(uint64_t requestID);
virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (102269 => 102270)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-12-07 21:18:30 UTC (rev 102269)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-12-07 21:43:11 UTC (rev 102270)
@@ -724,7 +724,7 @@
rect = frameRect();
}
- m_plugin->geometryDidChange(rect, clipRectInWindowCoordinates());
+ m_plugin->deprecatedGeometryDidChange(rect, clipRectInWindowCoordinates());
}
void PluginView::viewVisibilityDidChange()
