Changeset 139022 in webkit

Timestamp:

Jan 7, 2013 5:39:04 PM (11 years ago)

Author:

aelias@chromium.org

Message:

Divide gesture scroll delta by scale factor
​https://bugs.webkit.org/show_bug.cgi?id=106263

Reviewed by Adam Barth.

Gesture scroll deltas were not being adjusted by the frame's scale
factors, resulting in overly fast main-thread scrolling when zoomed
in.

New test: fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html

• page/EventHandler.cpp:

(WebCore::EventHandler::handleGestureScrollCore):

Location:

trunk

Files:

• LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled-expected.txt (added)
• LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html (added)
• LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-scaled-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Alexandre Elias  <aelias@chromium.org>
+
+        Divide gesture scroll delta by scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=106263
+
+        Reviewed by Adam Barth.
+
+        Gesture scroll deltas were not being adjusted by the frame's scale
+        factors, resulting in overly fast main-thread scrolling when zoomed
+        in.
+
+        New test: fast/events/touch/gesture/touch-gesture-scroll-div-scaled.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleGestureScrollCore):
+
 2013-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2600 +2600 @@
 {
     const float tickDivisor = (float)WheelEvent::tickMultiplier;
+    const float scaleFactor = m_frame->pageZoomFactor() * m_frame->frameScaleFactor();
+    float scaledDeltaX = gestureEvent.deltaX() / scaleFactor;
+    float scaledDeltaY = gestureEvent.deltaY() / scaleFactor;
     IntPoint point(gestureEvent.position().x(), gestureEvent.position().y());
     IntPoint globalPoint(gestureEvent.globalPosition().x(), gestureEvent.globalPosition().y());
     PlatformWheelEvent syntheticWheelEvent(point, globalPoint,
-        gestureEvent.deltaX(), gestureEvent.deltaY(), gestureEvent.deltaX() / tickDivisor, gestureEvent.deltaY() / tickDivisor,
+        scaledDeltaX, scaledDeltaY, scaledDeltaX / tickDivisor, scaledDeltaY / tickDivisor,
         granularity,
         gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());