gesture recognizer: Change the way a processed touch-release event is handled.

ui/base/gestures/gesture_sequence.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/gestures/gesture_sequence.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 64 matching lines @@
 
 enum EdgeStateSignatureType {
   GST_INVALID = -1,
 
   GST_NO_GESTURE_FIRST_PRESSED =
       G(GS_NO_GESTURE, 0, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED =
       G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_RELEASED, TSI_NOT_PROCESSED),
 
+  GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED_HANDLED =
+      G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_RELEASED, TSI_PROCESSED),
+
   // Ignore processed touch-move events until gesture-scroll starts.
   GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED =
       G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_MOVED, TSI_NOT_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_NOT_PROCESSED),
+      G(GS_PENDING_SYNTHETIC_CLICK, 0, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PENDING_SYNTHETIC_CLICK_SECOND_PRESSED =
       G(GS_PENDING_SYNTHETIC_CLICK, 1, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_SCROLL_FIRST_RELEASED =
-      G(GS_SCROLL, 0, TS_RELEASED, TSI_NOT_PROCESSED),
+      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),
 
   GST_SCROLL_FIRST_CANCELLED =
-      G(GS_SCROLL, 0, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_SCROLL, 0, TS_CANCELLED, TSI_ALWAYS),
 
   GST_SCROLL_SECOND_PRESSED =
       G(GS_SCROLL, 1, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED =
       G(GS_PENDING_TWO_FINGER_TAP, 0, TS_RELEASED, TSI_NOT_PROCESSED),
 
+  GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED =
+      G(GS_PENDING_TWO_FINGER_TAP, 0, TS_RELEASED, TSI_PROCESSED),
+
   GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED =
       G(GS_PENDING_TWO_FINGER_TAP, 1, TS_RELEASED, TSI_NOT_PROCESSED),
 
+  GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED =
+      G(GS_PENDING_TWO_FINGER_TAP, 1, TS_RELEASED, TSI_PROCESSED),
+
   GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED =
       G(GS_PENDING_TWO_FINGER_TAP, 0, TS_MOVED, TSI_ALWAYS),
 
   GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED =
       G(GS_PENDING_TWO_FINGER_TAP, 1, TS_MOVED, TSI_ALWAYS),
 
   GST_PENDING_TWO_FINGER_TAP_FIRST_CANCELLED =
-      G(GS_PENDING_TWO_FINGER_TAP, 0, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PENDING_TWO_FINGER_TAP, 0, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PENDING_TWO_FINGER_TAP_SECOND_CANCELLED =
-      G(GS_PENDING_TWO_FINGER_TAP, 1, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PENDING_TWO_FINGER_TAP, 1, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PENDING_TWO_FINGER_TAP_THIRD_PRESSED =
       G(GS_PENDING_TWO_FINGER_TAP, 2, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PINCH_FIRST_MOVED =
       G(GS_PINCH, 0, TS_MOVED, TSI_ALWAYS),
 
   GST_PINCH_SECOND_MOVED =
       G(GS_PINCH, 1, TS_MOVED, TSI_ALWAYS),
 
   GST_PINCH_FIRST_RELEASED =
-      G(GS_PINCH, 0, TS_RELEASED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 0, TS_RELEASED, TSI_ALWAYS),
 
   GST_PINCH_SECOND_RELEASED =
-      G(GS_PINCH, 1, TS_RELEASED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 1, TS_RELEASED, TSI_ALWAYS),
 
   GST_PINCH_FIRST_CANCELLED =
-      G(GS_PINCH, 0, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 0, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PINCH_SECOND_CANCELLED =
-      G(GS_PINCH, 1, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 1, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PINCH_THIRD_PRESSED =
       G(GS_PINCH, 2, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PINCH_THIRD_MOVED =
       G(GS_PINCH, 2, TS_MOVED, TSI_ALWAYS),
 
   GST_PINCH_THIRD_RELEASED =
-      G(GS_PINCH, 2, TS_RELEASED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 2, TS_RELEASED, TSI_ALWAYS),
 
   GST_PINCH_THIRD_CANCELLED =
-      G(GS_PINCH, 2, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 2, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PINCH_FOURTH_PRESSED =
       G(GS_PINCH, 3, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PINCH_FOURTH_MOVED =
       G(GS_PINCH, 3, TS_MOVED, TSI_ALWAYS),
 
   GST_PINCH_FOURTH_RELEASED =
-      G(GS_PINCH, 3, TS_RELEASED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 3, TS_RELEASED, TSI_ALWAYS),
 
   GST_PINCH_FOURTH_CANCELLED =
-      G(GS_PINCH, 3, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 3, TS_CANCELLED, TSI_ALWAYS),
 
   GST_PINCH_FIFTH_PRESSED =
       G(GS_PINCH, 4, TS_PRESSED, TSI_NOT_PROCESSED),
 
   GST_PINCH_FIFTH_MOVED =
       G(GS_PINCH, 4, TS_MOVED, TSI_ALWAYS),
 
   GST_PINCH_FIFTH_RELEASED =
-      G(GS_PINCH, 4, TS_RELEASED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 4, TS_RELEASED, TSI_ALWAYS),
 
   GST_PINCH_FIFTH_CANCELLED =
-      G(GS_PINCH, 4, TS_CANCELLED, TSI_NOT_PROCESSED),
+      G(GS_PINCH, 4, TS_CANCELLED, TSI_ALWAYS),
 };
 
 // Builds a signature. Signatures are assembled by joining together
 // multiple bits.
 // 1 LSB bit so that the computed signature is always greater than 0
 // 3 bits for the |type|.
 // 2 bit for |touch_status|
 // 12 bits for |touch_id|
 // 14 bits for the |gesture_state|.
 EdgeStateSignatureType Signature(GestureState gesture_state,
                                  unsigned int touch_id,
                                  ui::EventType type,
                                  TouchStatusInternal touch_status) {
   CHECK((touch_id & 0xfff) == touch_id);
   TouchState touch_state = TouchEventTypeToTouchState(type);
   EdgeStateSignatureType signature = static_cast<EdgeStateSignatureType>
       (G(gesture_state, touch_id, touch_state, touch_status));
 
   switch (signature) {
     case GST_NO_GESTURE_FIRST_PRESSED:
     case GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED:
+    case GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED_HANDLED:
     case GST_PENDING_SYNTHETIC_CLICK_FIRST_MOVED:
     case GST_PENDING_SYNTHETIC_CLICK_FIRST_STATIONARY:
     case GST_PENDING_SYNTHETIC_CLICK_FIRST_CANCELLED:
     case GST_PENDING_SYNTHETIC_CLICK_SECOND_PRESSED:
     case GST_SCROLL_FIRST_RELEASED:
     case GST_SCROLL_FIRST_MOVED:
     case GST_SCROLL_FIRST_CANCELLED:
     case GST_SCROLL_SECOND_PRESSED:
     case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED:
+    case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED:
+    case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED:
     case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED:
     case GST_PENDING_TWO_FINGER_TAP_FIRST_CANCELLED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_CANCELLED:
     case GST_PENDING_TWO_FINGER_TAP_THIRD_PRESSED:
     case GST_PINCH_FIRST_MOVED:
     case GST_PINCH_SECOND_MOVED:
     case GST_PINCH_FIRST_RELEASED:
     case GST_PINCH_SECOND_RELEASED:
     case GST_PINCH_FIRST_CANCELLED:
@@ skipping 123 matching lines @@
       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())) {
         set_state(GS_SCROLL);
         if (ScrollUpdate(event, point, gestures.get()))
           point.UpdateForScroll();
       }
       break;
+    case GST_PENDING_SYNTHETIC_CLICK_FIRST_RELEASED_HANDLED:
     case GST_PENDING_SYNTHETIC_CLICK_FIRST_CANCELLED:
       set_state(GS_NO_GESTURE);
       break;
     case GST_SCROLL_FIRST_MOVED:
       if (scroll_type_ == ST_VERTICAL ||
           scroll_type_ == ST_HORIZONTAL)
         BreakRailScroll(event, point, gestures.get());
       if (ScrollUpdate(event, point, gestures.get()))
         point.UpdateForScroll();
       break;
@@ skipping 15 matching lines @@
     case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED:
       TwoFingerTouchReleased(event, point, gestures.get());
       set_state(GS_SCROLL);
       break;
     case GST_PENDING_TWO_FINGER_TAP_FIRST_MOVED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_MOVED:
       if (TwoFingerTouchMove(event, point, gestures.get()))
         set_state(GS_PINCH);
       break;
+    case GST_PENDING_TWO_FINGER_TAP_FIRST_RELEASED_HANDLED:
+    case GST_PENDING_TWO_FINGER_TAP_SECOND_RELEASED_HANDLED:
     case GST_PENDING_TWO_FINGER_TAP_FIRST_CANCELLED:
     case GST_PENDING_TWO_FINGER_TAP_SECOND_CANCELLED:
       scroll_type_ = ST_FREE;
       set_state(GS_SCROLL);
       break;
     case GST_PENDING_TWO_FINGER_TAP_THIRD_PRESSED:
       PinchStart(event, point, gestures.get());
       set_state(GS_PINCH);
       break;
     case GST_PINCH_FIRST_MOVED:
@@ skipping 613 matching lines @@
     return;
 
   // Since long press timer has been started, there should be a non-NULL point.
   const GesturePoint* point = GetPointByPointId(0);
   if (!ui::gestures::IsInsideManhattanSquare(point->first_touch_position(),
       event.location()))
     long_press_timer_->Stop();
 }
 
 }  // namespace ui