Changeset 56515 in webkit

Timestamp:

Mar 25, 2010 1:49:05 AM (14 years ago)

Author:

jam@chromium.org

Message:

2010-03-10 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

[chromium] Fix up WebMouseWheelEventBuilder to properly calculate the units
​https://bugs.webkit.org/show_bug.cgi?id=35989

• src/WebInputEventConversion.cpp:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebInputEventConversion.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-10  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Fix up WebMouseWheelEventBuilder to properly calculate the units
+        https://bugs.webkit.org/show_bug.cgi?id=35989
+
+        * src/WebInputEventConversion.cpp:
+
 2010-03-24  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebKit/chromium/src/WebInputEventConversion.cpp

@@ -306 +306 @@
     x = event.offsetX();
     y = event.offsetY();
-    deltaX = static_cast<float>(event.wheelDeltaX());
-    deltaY = static_cast<float>(event.wheelDeltaY());
-    wheelTicksX = static_cast<float>(event.rawDeltaX());
-    wheelTicksY = static_cast<float>(event.rawDeltaY());
+    deltaX = static_cast<float>(event.rawDeltaX());
+    deltaY = static_cast<float>(event.rawDeltaY());
+    // The 120 is from WheelEvent::initWheelEvent().
+    wheelTicksX = static_cast<float>(event.wheelDeltaX()) / 120;
+    wheelTicksY = static_cast<float>(event.wheelDeltaY()) / 120;
     scrollByPage = event.granularity() == WheelEvent::Page;
 }