Changeset 99247 in webkit

Timestamp:

Nov 3, 2011, 4:55:21 PM (14 years ago)

Author:

andersca@apple.com

Message:

Add NetscapePlugin::convertToRootView
​https://bugs.webkit.org/show_bug.cgi?id=71519

Reviewed by Darin Adler.

Yet another step towards eliminating uses of m_frameRectInWindowCoordinates.

Also, use the "root view" terminology, since that's really what we mean here.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::callSetWindow):
Use convertToRootView to get the plug-in location and clip rect in root view coordinates.

(WebKit::NetscapePlugin::convertToRootView):
Apply the m_pluginToRootViewTransform.mapPoint transform.

• WebProcess/Plugins/Netscape/NetscapePlugin.h:

Add convertToRootView.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-03  Anders Carlsson  <andersca@apple.com>
+
+        Add NetscapePlugin::convertToRootView
+        https://bugs.webkit.org/show_bug.cgi?id=71519
+
+        Reviewed by Darin Adler.
+
+        Yet another step towards eliminating uses of m_frameRectInWindowCoordinates.
+
+        Also, use the "root view" terminology, since that's really what we mean here.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::callSetWindow):
+        Use convertToRootView to get the plug-in location and clip rect in root view coordinates.
+
+        (WebKit::NetscapePlugin::convertToRootView):
+        Apply the m_pluginToRootViewTransform.mapPoint transform.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        Add convertToRootView.
+
 2011-11-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -485 +485 @@
 {
     if (wantsWindowRelativeNPWindowCoordinates()) {
-        m_npWindow.x = m_frameRectInWindowCoordinates.x();
-        m_npWindow.y = m_frameRectInWindowCoordinates.y();
-        m_npWindow.clipRect.top = m_clipRectInWindowCoordinates.y();
-        m_npWindow.clipRect.left = m_clipRectInWindowCoordinates.x();
+        IntPoint pluginLocationInRootViewCoordinates = convertToRootView(IntPoint());
+        IntPoint clipRectInRootViewCoordinates = convertToRootView(m_clipRect.location());
+
+        m_npWindow.x = pluginLocationInRootViewCoordinates.x();
+        m_npWindow.y = pluginLocationInRootViewCoordinates.y();
+        m_npWindow.clipRect.top = clipRectInRootViewCoordinates.y();
+        m_npWindow.clipRect.left = clipRectInRootViewCoordinates.x();
     } else {
         m_npWindow.x = 0;
@@ -948 +951 @@
 }
 
+IntPoint NetscapePlugin::convertToRootView(const IntPoint& pointInPluginCoordinates) const
+{
+    return m_pluginToRootViewTransform.mapPoint(pointInPluginCoordinates);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -218 +218 @@
     bool supportsSnapshotting() const;
 
+    // Convert the given point from plug-in coordinates to root view coordinates.
+    WebCore::IntPoint convertToRootView(const WebCore::IntPoint&) const;
+
 #if PLUGIN_ARCHITECTURE(WIN)
     static BOOL WINAPI hookedTrackPopupMenu(HMENU, UINT uFlags, int x, int y, int nReserved, HWND, const RECT*);