Changeset 143068 in webkit

Timestamp:

Feb 15, 2013 4:33:06 PM (11 years ago)

Author:

eae@chromium.org

Message:

Change MouseRelatedEvent to use LayoutPoint::scale
​https://bugs.webkit.org/show_bug.cgi?id=109979

Reviewed by Dimitri Glazkov.

Change MouseRelatedEvent::MouseRelatedEvent to use LayoutPoint::
scale to adjust location and scroll offset for scale factor and
zooming.

No new tests, no change in functionality.

• dom/MouseRelatedEvent.cpp:

(WebCore::MouseRelatedEvent::MouseRelatedEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MouseRelatedEvent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Emil A Eklund  <eae@chromium.org>
+
+        Change MouseRelatedEvent to use LayoutPoint::scale
+        https://bugs.webkit.org/show_bug.cgi?id=109979
+
+        Reviewed by Dimitri Glazkov.
+        
+        Change MouseRelatedEvent::MouseRelatedEvent to use LayoutPoint::
+        scale to adjust location and scroll offset for scale factor and
+        zooming.
+
+        No new tests, no change in functionality.
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::MouseRelatedEvent):
+
 2013-02-15  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/dom/MouseRelatedEvent.cpp

@@ -74 +74 @@
             scrollPosition = frameView->scrollPosition();
             adjustedPageLocation = frameView->windowToContents(windowLocation);
-            float scaleFactor = frame->pageZoomFactor() * frame->frameScaleFactor();
+            float scaleFactor = 1 / (frame->pageZoomFactor() * frame->frameScaleFactor());
             if (scaleFactor != 1.0f) {
-                // Adjust our pageX and pageY to account for the page zoom.
-                adjustedPageLocation.scale(1 / scaleFactor, 1 / scaleFactor);
-
-                // FIXME: Change this to use float math and proper rounding (or
-                // better yet, use LayoutPoint::scale).
-                scrollPosition.setX(scrollPosition.x() / scaleFactor);
-                scrollPosition.setY(scrollPosition.y() / scaleFactor);
+                adjustedPageLocation.scale(scaleFactor, scaleFactor);
+                scrollPosition.scale(scaleFactor, scaleFactor);
             }
         }