summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/overscroll_controller.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 16:24:20 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 16:24:20 +0000
commitd6d8dc82f730516a28cebd90b509c9597b9d0058 (patch)
treec726919eca70461e615c4f241928a8d6b2ecf716 /content/browser/renderer_host/overscroll_controller.cc
parent3b9c4d6c1cac788bd5a90aa9c95c9334464eca44 (diff)
downloadchromium_src-d6d8dc82f730516a28cebd90b509c9597b9d0058.zip
chromium_src-d6d8dc82f730516a28cebd90b509c9597b9d0058.tar.gz
chromium_src-d6d8dc82f730516a28cebd90b509c9597b9d0058.tar.bz2
aura: Populate and use the newly added acceleration ratio fields in wheel-events.
Wheel-scroll event deltas can have acceleration (e.g. when doing repeated scrolls). But for overscroll, it makes more sense to use the unaccelerated deltas. BUG=175604 Review URL: https://codereview.chromium.org/12223110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/overscroll_controller.cc')
-rw-r--r--content/browser/renderer_host/overscroll_controller.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc
index feb4247..dceefa4 100644
--- a/content/browser/renderer_host/overscroll_controller.cc
+++ b/content/browser/renderer_host/overscroll_controller.cc
@@ -171,8 +171,10 @@ void OverscrollController::ProcessEventForOverscroll(
case WebKit::WebInputEvent::MouseWheel: {
const WebKit::WebMouseWheelEvent& wheel =
static_cast<const WebKit::WebMouseWheelEvent&>(event);
- if (wheel.hasPreciseScrollingDeltas)
- ProcessOverscroll(wheel.deltaX, wheel.deltaY);
+ if (wheel.hasPreciseScrollingDeltas) {
+ ProcessOverscroll(wheel.deltaX * wheel.accelerationRatioX,
+ wheel.deltaY * wheel.accelerationRatioY);
+ }
break;
}
case WebKit::WebInputEvent::GestureScrollUpdate: {