summaryrefslogtreecommitdiffstats
path: root/ui/events/gestures
diff options
context:
space:
mode:
authortdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 22:26:35 +0000
committertdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 22:26:35 +0000
commit2ab0dc78047836d6e978a8d33f7948e16d8ae98b (patch)
tree8132bb46e86a5860b1660cb32f84dded620b13c9 /ui/events/gestures
parentd55cf42e42e747455e73438b154902701565a5ee (diff)
downloadchromium_src-2ab0dc78047836d6e978a8d33f7948e16d8ae98b.zip
chromium_src-2ab0dc78047836d6e978a8d33f7948e16d8ae98b.tar.gz
chromium_src-2ab0dc78047836d6e978a8d33f7948e16d8ae98b.tar.bz2
On consumed touchMove, update touch point scroll state.
This avoids scroll events with incorrect large deltas due to touchmove absorption. BUG=358256 TEST=GestureRecognizerTest.ScrollAlternatelyConsumedTest Review URL: https://codereview.chromium.org/219403005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/events/gestures')
-rw-r--r--ui/events/gestures/gesture_sequence.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/events/gestures/gesture_sequence.cc b/ui/events/gestures/gesture_sequence.cc
index a3198b0..2ca1579 100644
--- a/ui/events/gestures/gesture_sequence.cc
+++ b/ui/events/gestures/gesture_sequence.cc
@@ -612,6 +612,8 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
point.UpdateForScroll();
break;
case GST_SCROLL_FIRST_MOVED_HANDLED:
+ if (point.DidScroll(event, 0))
+ point.UpdateForScroll();
break;
case GST_SCROLL_FIRST_RELEASED:
case GST_SCROLL_FIRST_CANCELLED: