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

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

Issue 1052433003: Allow postponed rail application for touch scrolling - blink side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix broken test. Created 5 years, 9 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
« no previous file with comments | « no previous file | Source/platform/PlatformGestureEvent.h » ('j') | Source/web/WebInputEvent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 7a6b2740d320eb8558180654e6aa6c0a02c0ce8d..e3e2df14328dadcccf1ca5f175c85f18700f2380 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -2569,8 +2569,12 @@ bool EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureE
bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gestureEvent)
{
ASSERT(gestureEvent.type() == PlatformEvent::GestureScrollUpdate);
-
- FloatSize delta(gestureEvent.deltaX(), gestureEvent.deltaY());
+ bool ignoreX = gestureEvent.railsMode() == PlatformEvent::RailsModeVertical;
+ bool ignoreY = gestureEvent.railsMode() == PlatformEvent::RailsModeHorizontal;
+ FloatSize delta(ignoreX ? 0 : gestureEvent.deltaX(),
+ ignoreY ? 0 : gestureEvent.deltaY());
+ FloatSize velocity(ignoreX ? 0 : gestureEvent.velocityX(),
+ ignoreY ? 0 : gestureEvent.velocityY());
if (delta.isZero())
return false;
@@ -2601,8 +2605,8 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
bool scrolled = false;
if (RuntimeEnabledFeatures::scrollCustomizationEnabled()) {
RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(
- gestureEvent.deltaX(), gestureEvent.deltaY(),
- 0, gestureEvent.velocityX(), gestureEvent.velocityY(),
+ delta.width(), delta.height(),
+ 0, velocity.width(), velocity.height(),
gestureEvent.inertial(), /* isBeginning */
false, /* isEnding */ false, /* fromUserInput */ true,
!gestureEvent.preventPropagation(), m_deltaConsumedForScrollSequence);
« no previous file with comments | « no previous file | Source/platform/PlatformGestureEvent.h » ('j') | Source/web/WebInputEvent.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698