Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(982)

Unified Diff: Source/core/page/EventHandler.cpp

Issue 472463002: On some webpages, touch scrolling speed is too slow / fast (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed touch scrolling when browser-zoomed in/out. Added tests. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 21ed824b1a70e8a6b4251948d86f695876461802..336927ec25899cf9890c506f271d6e766944c3e9 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -2417,9 +2417,6 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
if (delta.isZero())
return false;
- const float scaleFactor = m_frame->pageZoomFactor();
- delta.scale(1 / scaleFactor, 1 / scaleFactor);
-
Node* node = m_scrollGestureHandlingNode.get();
if (!node)
return sendScrollEventToView(gestureEvent, delta);
@@ -2462,7 +2459,7 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
return sendScrollEventToView(gestureEvent, delta);
}
-bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEvent, const FloatSize& scaledDelta)
+bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEvent, const FloatSize& delta)
{
FrameView* view = m_frame->view();
if (!view)
@@ -2472,8 +2469,8 @@ bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEven
IntPoint point(gestureEvent.position().x(), gestureEvent.position().y());
IntPoint globalPoint(gestureEvent.globalPosition().x(), gestureEvent.globalPosition().y());
PlatformWheelEvent syntheticWheelEvent(point, globalPoint,
- scaledDelta.width(), scaledDelta.height(),
- scaledDelta.width() / tickDivisor, scaledDelta.height() / tickDivisor,
+ delta.width(), delta.height(),
+ delta.width() / tickDivisor, delta.height() / tickDivisor,
ScrollByPixelWheelEvent,
gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());
syntheticWheelEvent.setHasPreciseScrollingDeltas(true);

Powered by Google App Engine
This is Rietveld 408576698