| Index: ui/events/gestures/gesture_sequence.cc
|
| diff --git a/ui/events/gestures/gesture_sequence.cc b/ui/events/gestures/gesture_sequence.cc
|
| index 6427c17546ca4f2a87fb52f327e2b63f35beb92b..719e67d791e0932889d3a37393c80e3abbe98c4d 100644
|
| --- a/ui/events/gestures/gesture_sequence.cc
|
| +++ b/ui/events/gestures/gesture_sequence.cc
|
| @@ -138,9 +138,11 @@ enum EdgeStateSignatureType {
|
| GST_SCROLL_FIRST_RELEASED =
|
| G(GS_SCROLL, 0, TS_RELEASED, TSI_ALWAYS),
|
|
|
| - // Once scroll has started, process all touch-move events.
|
| GST_SCROLL_FIRST_MOVED =
|
| - G(GS_SCROLL, 0, TS_MOVED, TSI_ALWAYS),
|
| + G(GS_SCROLL, 0, TS_MOVED, TSI_NOT_PROCESSED),
|
| +
|
| + GST_SCROLL_FIRST_MOVED_HANDLED =
|
| + G(GS_SCROLL, 0, TS_MOVED, TSI_PROCESSED),
|
|
|
| GST_SCROLL_FIRST_CANCELLED =
|
| G(GS_SCROLL, 0, TS_CANCELLED, TSI_ALWAYS),
|
| @@ -352,6 +354,7 @@ EdgeStateSignatureType Signature(GestureState gesture_state,
|
| case GST_SYNTHETIC_CLICK_ABORTED_SECOND_PRESSED:
|
| case GST_SCROLL_FIRST_RELEASED:
|
| case GST_SCROLL_FIRST_MOVED:
|
| + case GST_SCROLL_FIRST_MOVED_HANDLED:
|
| case GST_SCROLL_FIRST_CANCELLED:
|
| case GST_SCROLL_SECOND_PRESSED:
|
| case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED:
|
| @@ -608,6 +611,8 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
|
| if (ScrollUpdate(event, point, gestures.get(), FS_NOT_FIRST_SCROLL))
|
| point.UpdateForScroll();
|
| break;
|
| + case GST_SCROLL_FIRST_MOVED_HANDLED:
|
| + break;
|
| case GST_SCROLL_FIRST_RELEASED:
|
| case GST_SCROLL_FIRST_CANCELLED:
|
| ScrollEnd(event, point, gestures.get());
|
|
|