| Index: ui/events/gestures/gesture_sequence.cc
|
| diff --git a/ui/events/gestures/gesture_sequence.cc b/ui/events/gestures/gesture_sequence.cc
|
| index 74bc807d68f3acc05d1483c35051832a0fdcfbda..0872bdff3a086ecfcbfe820bdcf715409985c144 100644
|
| --- a/ui/events/gestures/gesture_sequence.cc
|
| +++ b/ui/events/gestures/gesture_sequence.cc
|
| @@ -29,7 +29,6 @@ enum TouchState {
|
| TS_RELEASED,
|
| TS_PRESSED,
|
| TS_MOVED,
|
| - TS_STATIONARY,
|
| TS_CANCELLED,
|
| TS_UNKNOWN,
|
| };
|
| @@ -60,8 +59,6 @@ TouchState TouchEventTypeToTouchState(ui::EventType type) {
|
| return TS_PRESSED;
|
| case ui::ET_TOUCH_MOVED:
|
| return TS_MOVED;
|
| - case ui::ET_TOUCH_STATIONARY:
|
| - return TS_STATIONARY;
|
| case ui::ET_TOUCH_CANCELLED:
|
| return TS_CANCELLED;
|
| default:
|
| @@ -99,9 +96,6 @@ enum EdgeStateSignatureType {
|
| GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED_PROCESSED =
|
| G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_MOVED, TSI_PROCESSED),
|
|
|
| - GST_PENDING_SYNTHETIC_CLICK_FIRST_STATIONARY =
|
| - G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_STATIONARY, TSI_NOT_PROCESSED),
|
| -
|
| GST_PENDING_SYNTHETIC_CLICK_FIRST_CANCELLED =
|
| G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_CANCELLED, TSI_ALWAYS),
|
|
|
| @@ -120,9 +114,6 @@ enum EdgeStateSignatureType {
|
| GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_MOVED =
|
| G(GS_PENDING_SYNTHETIC_CLICK_NO_SCROLL, 0, TS_MOVED, TSI_ALWAYS),
|
|
|
| - GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_STATIONARY =
|
| - G(GS_PENDING_SYNTHETIC_CLICK_NO_SCROLL, 0, TS_STATIONARY, TSI_ALWAYS),
|
| -
|
| GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_CANCELLED =
|
| G(GS_PENDING_SYNTHETIC_CLICK_NO_SCROLL, 0, TS_CANCELLED, TSI_ALWAYS),
|
|
|
| @@ -341,13 +332,11 @@ EdgeStateSignatureType Signature(GestureState gesture_state,
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED_HANDLED:
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED:
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED_PROCESSED:
|
| - case GST_PENDING_SYNTHETIC_CLICK_FIRST_STATIONARY:
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_CANCELLED:
|
| case GST_PENDING_SYNTHETIC_CLICK_SECOND_PRESSED:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_RELEASED_HANDLED:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_MOVED:
|
| - case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_STATIONARY:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_CANCELLED:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_SECOND_PRESSED:
|
| case GST_SYNTHETIC_CLICK_ABORTED_FIRST_RELEASED:
|
| @@ -576,7 +565,6 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
|
| set_state(GS_NO_GESTURE);
|
| break;
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED:
|
| - case GST_PENDING_SYNTHETIC_CLICK_FIRST_STATIONARY:
|
| if (ScrollStart(event, point, gestures.get())) {
|
| PrependTapCancelGestureEvent(point, gestures.get());
|
| set_state(GS_SCROLL);
|
| @@ -586,7 +574,6 @@ GestureSequence::Gestures* GestureSequence::ProcessTouchEventForGesture(
|
| break;
|
| case GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED_PROCESSED:
|
| case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_MOVED:
|
| - case GST_PENDING_SYNTHETIC_CLICK_NO_SCROLL_FIRST_STATIONARY:
|
| if (point.IsInScrollWindow(event)) {
|
| PrependTapCancelGestureEvent(point, gestures.get());
|
| set_state(GS_SYNTHETIC_CLICK_ABORTED);
|
|
|