Changeset 102540 in webkit

Timestamp:

Dec 11, 2011 11:38:49 AM (12 years ago)

Author:

kling@webkit.org

Message:

WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
<​http://webkit.org/b/74209> and <rdar://problem/10438197>

Reviewed by Anders Carlsson.

Source/WebCore:

• WebCore.exp.in: Export AffineTransform::scale(double).

Source/WebKit2:

• Shared/WebEvent.h:
• Shared/WebMouseEvent.cpp:

Remove the WebMouseEvent "copy" constructor that applied a scale factor
to the coordinates of an existing event.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::handleEvent):

Pass the WebMouseEvent through to the plugin unmodified.

(WebKit::PluginView::viewGeometryDidChange):

Plumb a complex translate+scale transform through to the plugin, so coordinate
space transformations in will behave correctly with scale factors other than 1.

LayoutTests:

Add a test verifying that NetscapePlugins receive correctly transformed
mouse events with a page scale factor applied.

• platform/mac-wk2/plugins/mouse-events-scaled-expected.txt: Added.
• platform/mac-wk2/plugins/mouse-events-scaled.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled-expected.txt (added)
• LayoutTests/platform/mac-wk2/plugins/mouse-events-scaled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebEvent.h (modified) (1 diff)
• Source/WebKit2/Shared/WebMouseEvent.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-11  Andreas Kling  <kling@webkit.org>
+
+        WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
+        <http://webkit.org/b/74209> and <rdar://problem/10438197>
+
+        Reviewed by Anders Carlsson.
+
+        Add a test verifying that NetscapePlugins receive correctly transformed
+        mouse events with a page scale factor applied.
+
+        * platform/mac-wk2/plugins/mouse-events-scaled-expected.txt: Added.
+        * platform/mac-wk2/plugins/mouse-events-scaled.html: Added.
+
 2011-12-11  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-11  Andreas Kling  <kling@webkit.org>
+
+        WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
+        <http://webkit.org/b/74209> and <rdar://problem/10438197>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCore.exp.in: Export AffineTransform::scale(double).
+
 2011-12-10  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -408 +408 @@
 __ZN7WebCore14endOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore15AffineTransform5flipYEv
+__ZN7WebCore15AffineTransform5scaleEd
 __ZN7WebCore15AffineTransform8multiplyERKS0_
 __ZN7WebCore15AffineTransform9translateEdd

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-11  Andreas Kling  <kling@webkit.org>
+
+        WK2/NetscapePlugin: Incorrect mouse event coordinates when frameScaleFactor != 1.
+        <http://webkit.org/b/74209> and <rdar://problem/10438197>
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebEvent.h:
+        * Shared/WebMouseEvent.cpp:
+
+            Remove the WebMouseEvent "copy" constructor that applied a scale factor
+            to the coordinates of an existing event.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::handleEvent):
+
+            Pass the WebMouseEvent through to the plugin unmodified.
+
+        (WebKit::PluginView::viewGeometryDidChange):
+
+            Plumb a complex translate+scale transform through to the plugin, so coordinate
+            space transformations in will behave correctly with scale factors other than 1.
+
 2011-12-10  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/WebEvent.h

@@ -126 +126 @@
     WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, bool didActivateWebView);
 #endif
-    
-    WebMouseEvent(const WebMouseEvent&, float pageScaleFactor);
 
     Button button() const { return static_cast<Button>(m_button); }

trunk/Source/WebKit2/Shared/WebMouseEvent.cpp

@@ -79 +79 @@
 #endif
 
-WebMouseEvent::WebMouseEvent(const WebMouseEvent& event, float pageScaleFactor)
-    : WebEvent(event.type(), event.modifiers(), event.timestamp())
-    , m_button(event.button())
-    , m_position(WebCore::IntPoint(event.position().x() / pageScaleFactor, event.position().y() / pageScaleFactor))
-    , m_globalPosition(m_position + (event.globalPosition() - event.position()))
-    , m_deltaX(event.deltaX())
-    , m_deltaY(event.deltaY())
-    , m_deltaZ(event.deltaZ())
-    , m_clickCount(event.clickCount())
-#if PLATFORM(WIN)
-    , m_didActivateWebView(false)
-#endif
-{
-}
-
 void WebMouseEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
 {

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -634 +634 @@
         if (currentEvent->type() == WebEvent::MouseDown)
             focusPluginElement();
-        
-        // Adjust mouse coordinates to account for frameScaleFactor
-        WebMouseEvent eventWithScaledCoordinates(*static_cast<const WebMouseEvent*>(currentEvent), frame()->frameScaleFactor());
-        didHandleEvent = m_plugin->handleMouseEvent(eventWithScaledCoordinates);
+
+        didHandleEvent = m_plugin->handleMouseEvent(static_cast<const WebMouseEvent&>(*currentEvent));
     } else if (event->type() == eventNames().mousewheelEvent && currentEvent->type() == WebEvent::Wheel) {
         // We have a wheel event.
@@ -707 +705 @@
         return;
 
-    // FIXME: Just passing a translation matrix isn't good enough.
-    IntPoint locationInWindowCoordinates = parent()->contentsToRootView(frameRect().location());
-    AffineTransform transform = AffineTransform::translation(locationInWindowCoordinates.x(), locationInWindowCoordinates.y());
+    ASSERT(frame());
+    float frameScaleFactor = frame()->frameScaleFactor();
+
+    IntPoint scaledFrameRectLocation(frameRect().location().x() * frameScaleFactor, frameRect().location().y() * frameScaleFactor);
+    IntPoint scaledLocationInRootViewCoordinates(parent()->contentsToRootView(scaledFrameRectLocation));
+
+    // FIXME: We still don't get the right coordinates for transformed plugins.
+    AffineTransform transform;
+    transform.translate(scaledLocationInRootViewCoordinates.x(), scaledLocationInRootViewCoordinates.y());
+    transform.scale(frameScaleFactor);
 
     // FIXME: The clip rect isn't correct.