Support tap_count in ui::GestureProvider.

ui/events/gesture_detection/gesture_detector.h

 // Copyright 2014 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.
 
 #ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
 #define UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/gesture_detection/gesture_detection_export.h"
@@ skipping 51 matching lines @@
 
     // Maximum time the second pointer can be active for a two finger tap.
     base::TimeDelta two_finger_tap_timeout;
   };
 
   class GestureListener {
    public:
     virtual ~GestureListener() {}
     virtual bool OnDown(const MotionEvent& e) = 0;
     virtual void OnShowPress(const MotionEvent& e) = 0;
-    virtual bool OnSingleTapUp(const MotionEvent& e) = 0;
+    virtual bool OnSingleTapUp(const MotionEvent& e, int tap_count) = 0;
     virtual bool OnLongPress(const MotionEvent& e) = 0;
     virtual bool OnScroll(const MotionEvent& e1,
                           const MotionEvent& e2,
                           float distance_x,
                           float distance_y) = 0;
     virtual bool OnFling(const MotionEvent& e1,
                          const MotionEvent& e2,
                          float velocity_x,
                          float velocity_y) = 0;
     // Added for Chromium (Aura).
     virtual bool OnSwipe(const MotionEvent& e1,
                          const MotionEvent& e2,
                          float velocity_x,
                          float velocity_y) = 0;
     virtual bool OnTwoFingerTap(const MotionEvent& e1,
                                 const MotionEvent& e2) = 0;
   };
 
   class DoubleTapListener {
    public:
     virtual ~DoubleTapListener() {}
-    virtual bool OnSingleTapConfirmed(const MotionEvent& e) = 0;
+    virtual bool OnSingleTapConfirmed(const MotionEvent& e, int tap_count) = 0;
     virtual bool OnDoubleTap(const MotionEvent& e) = 0;
     virtual bool OnDoubleTapEvent(const MotionEvent& e) = 0;
   };
 
   // A convenience class to extend when you only want to listen for a subset
   // of all the gestures. This implements all methods in the
   // |GestureListener| and |DoubleTapListener| but does
   // nothing and returns false for all applicable methods.
   class SimpleGestureListener : public GestureListener,
                                 public DoubleTapListener {
    public:
     // GestureListener implementation.
     virtual bool OnDown(const MotionEvent& e) OVERRIDE;
     virtual void OnShowPress(const MotionEvent& e) OVERRIDE;
-    virtual bool OnSingleTapUp(const MotionEvent& e) OVERRIDE;
+    virtual bool OnSingleTapUp(const MotionEvent& e, int tap_count) OVERRIDE;
     virtual bool OnLongPress(const MotionEvent& e) OVERRIDE;
     virtual bool OnScroll(const MotionEvent& e1,
                           const MotionEvent& e2,
                           float distance_x,
                           float distance_y) OVERRIDE;
     virtual bool OnFling(const MotionEvent& e1,
                          const MotionEvent& e2,
                          float velocity_x,
                          float velocity_y) OVERRIDE;
     virtual bool OnSwipe(const MotionEvent& e1,
                          const MotionEvent& e2,
                          float velocity_x,
                          float velocity_y) OVERRIDE;
     virtual bool OnTwoFingerTap(const MotionEvent& e1,
                                 const MotionEvent& e2) OVERRIDE;
 
     // DoubleTapListener implementation.
-    virtual bool OnSingleTapConfirmed(const MotionEvent& e) OVERRIDE;
+    virtual bool OnSingleTapConfirmed(const MotionEvent& e,
+                                      int tap_count) OVERRIDE;
     virtual bool OnDoubleTap(const MotionEvent& e) OVERRIDE;
     virtual bool OnDoubleTapEvent(const MotionEvent& e) OVERRIDE;
   };
 
   GestureDetector(const Config& config,
                   GestureListener* listener,
                   DoubleTapListener* optional_double_tap_listener);
   ~GestureDetector();
 
   bool OnTouchEvent(const MotionEvent& ev);
@@ skipping 37 matching lines @@
   base::TimeDelta two_finger_tap_timeout_;
 
   bool still_down_;
   bool defer_confirm_single_tap_;
   bool in_longpress_;
   bool always_in_tap_region_;
   bool always_in_bigger_tap_region_;
   bool two_finger_tap_allowed_for_gesture_;
 
   scoped_ptr<MotionEvent> current_down_event_;
+  scoped_ptr<MotionEvent> previous_down_event_;
   scoped_ptr<MotionEvent> previous_up_event_;
   scoped_ptr<MotionEvent> secondary_pointer_down_event_;
 
   // True when the user is still touching for the second tap (down, move, and
   // up events). Can only be true if there is a double tap listener attached.
   bool is_double_tapping_;
 
   float last_focus_x_;
   float last_focus_y_;
   float down_focus_x_;
   float down_focus_y_;
 
   bool longpress_enabled_;
   bool swipe_enabled_;
   bool two_finger_tap_enabled_;
 
+  // If the double tap gesture is disabled, this counts the number of successive
+  // taps which occured within the double tap window. The current maximum is 3.
+  int tap_count_;
+
   // Determines speed during touch scrolling.
   VelocityTrackerState velocity_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureDetector);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_