[chromium] Add acceleration ratios for the deltas to WebMouseWheelEvents.

https://bugs.webkit.org/show_bug.cgi?id=109611

The deltas in mousewheel events generated by track can be accelerated (e.g. when
scrolling repeatedly). Keep track of the ratio of the acceleration since that is
useful for some tasks (e.g. overflow navigation gesture).

Patch by Sadrul Habib Chowdhury <sadrul@chromium.org> on 2013-02-13
Reviewed by Adam Barth.

* public/WebInputEvent.h:
(WebKit::WebMouseWheelEvent::WebMouseWheelEvent):
* src/WebInputEvent.cpp:
(SameSizeAsWebMouseWheelEvent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 673eb20d99269d6e88b62a6d40e24dd3db000764..52f7855fbd3b32cb2e0fbe527b10c8eb17b4fa08 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2013-02-13  Sadrul Habib Chowdhury  <sadrul@chromium.org>
+
+        [chromium] Add acceleration ratios for the deltas to WebMouseWheelEvents.
+        https://bugs.webkit.org/show_bug.cgi?id=109611
+
+        The deltas in mousewheel events generated by track can be accelerated (e.g. when
+        scrolling repeatedly). Keep track of the ratio of the acceleration since that is
+        useful for some tasks (e.g. overflow navigation gesture).
+
+        Reviewed by Adam Barth.
+
+        * public/WebInputEvent.h:
+        (WebKit::WebMouseWheelEvent::WebMouseWheelEvent):
+        * src/WebInputEvent.cpp:
+        (SameSizeAsWebMouseWheelEvent):
+
 2013-02-12  Yoshifumi Inoue  <yosin@chromium.org>
 
         Unreviewed. Build fix for Chromium-Win.

diff --git a/Source/WebKit/chromium/public/WebInputEvent.h b/Source/WebKit/chromium/public/WebInputEvent.h
index 7a63c1251c3b528e64e2dba6ff7ba7e8f180a287..901109340c410afc0ead18960050604697a77650 100644 (file)
--- a/Source/WebKit/chromium/public/WebInputEvent.h
+++ b/Source/WebKit/chromium/public/WebInputEvent.h
@@ -367,6 +367,9 @@ public:
     float wheelTicksX;
     float wheelTicksY;
 
+    float accelerationRatioX;
+    float accelerationRatioY;
+
     // See comment at the top of the file for why an int is used here.
     int scrollByPage;
 
@@ -381,6 +384,8 @@ public:
         , deltaY(0.0f)
         , wheelTicksX(0.0f)
         , wheelTicksY(0.0f)
+        , accelerationRatioX(1.0f)
+        , accelerationRatioY(1.0f)
         , scrollByPage(false)
         , hasPreciseScrollingDeltas(false)
         , phase(PhaseNone)

diff --git a/Source/WebKit/chromium/src/WebInputEvent.cpp b/Source/WebKit/chromium/src/WebInputEvent.cpp
index a0d0380e5d7e012b8fb1d853c7e5ed5436ab9121..ed85ab3de5e7d153d73c17716058a3181e1f4e6e 100644 (file)
--- a/Source/WebKit/chromium/src/WebInputEvent.cpp
+++ b/Source/WebKit/chromium/src/WebInputEvent.cpp
@@ -56,7 +56,7 @@ struct SameSizeAsWebMouseEvent : public SameSizeAsWebInputEvent {
 };
 
 struct SameSizeAsWebMouseWheelEvent : public SameSizeAsWebMouseEvent {
-    int mousewheelData[8];
+    int mousewheelData[10];
 };
 
 struct SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent {