Make GestureTextSelector detect its own gestures

ui/events/gesture_detection/gesture_detector.cc

 // 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/gesture_detection/gesture_detector.h"
 
 #include <cmath>
 
 #include "base/timer/timer.h"
+#include "ui/events/gesture_detection/gesture_listeners.h"
 #include "ui/events/gesture_detection/motion_event.h"
 
 namespace ui {
 namespace {
 
 // Using a small epsilon when comparing slop distances allows pixel perfect
 // slop determination when using fractional DIP coordinates (assuming the slop
 // region and DPI scale are reasonably proportioned).
 const float kSlopEpsilon = .05f;
 
@@ skipping 27 matching lines @@
       swipe_enabled(false),
       minimum_swipe_velocity(20),
       maximum_swipe_deviation_angle(20.f),
       two_finger_tap_enabled(false),
       two_finger_tap_max_separation(300),
       two_finger_tap_timeout(base::TimeDelta::FromMilliseconds(700)) {
 }
 
 GestureDetector::Config::~Config() {}
 
-bool GestureDetector::SimpleGestureListener::OnDown(const MotionEvent& e) {
-  return false;
-}
-
-void GestureDetector::SimpleGestureListener::OnShowPress(const MotionEvent& e) {
-}
-
-bool GestureDetector::SimpleGestureListener::OnSingleTapUp(
-    const MotionEvent& e) {
-  return false;
-}
-
-void GestureDetector::SimpleGestureListener::OnLongPress(const MotionEvent& e) {
-}
-
-bool GestureDetector::SimpleGestureListener::OnScroll(const MotionEvent& e1,
-                                                      const MotionEvent& e2,
-                                                      float distance_x,
-                                                      float distance_y) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnFling(const MotionEvent& e1,
-                                                     const MotionEvent& e2,
-                                                     float velocity_x,
-                                                     float velocity_y) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnSwipe(const MotionEvent& e1,
-                                                     const MotionEvent& e2,
-                                                     float velocity_x,
-                                                     float velocity_y) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnTwoFingerTap(
-    const MotionEvent& e1,
-    const MotionEvent& e2) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnSingleTapConfirmed(
-    const MotionEvent& e) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnDoubleTap(const MotionEvent& e) {
-  return false;
-}
-
-bool GestureDetector::SimpleGestureListener::OnDoubleTapEvent(
-    const MotionEvent& e) {
-  return false;
-}
-
 class GestureDetector::TimeoutGestureHandler {
  public:
   TimeoutGestureHandler(const Config& config, GestureDetector* gesture_detector)
       : gesture_detector_(gesture_detector) {
     DCHECK(config.showpress_timeout <= config.longpress_timeout);
 
     timeout_callbacks_[SHOW_PRESS] = &GestureDetector::OnShowPressTimeout;
     timeout_delays_[SHOW_PRESS] = config.showpress_timeout;
 
     timeout_callbacks_[LONG_PRESS] = &GestureDetector::OnLongPressTimeout;
@@ skipping 54 matching lines @@
       defer_confirm_single_tap_(false),
       always_in_tap_region_(false),
       always_in_bigger_tap_region_(false),
       two_finger_tap_allowed_for_gesture_(false),
       is_double_tapping_(false),
       last_focus_x_(0),
       last_focus_y_(0),
       down_focus_x_(0),
       down_focus_y_(0),
       longpress_enabled_(true),
+      showpress_enabled_(true),
       swipe_enabled_(false),
       two_finger_tap_enabled_(false) {
   DCHECK(listener_);
   Init(config);
 }
 
 GestureDetector::~GestureDetector() {}
 
 bool GestureDetector::OnTouchEvent(const MotionEvent& ev) {
   const MotionEvent::Action action = ev.GetAction();
@@ skipping 108 matching lines @@
 
       secondary_pointer_down_event_.reset();
       always_in_tap_region_ = true;
       always_in_bigger_tap_region_ = true;
       still_down_ = true;
       defer_confirm_single_tap_ = false;
       two_finger_tap_allowed_for_gesture_ = two_finger_tap_enabled_;
 
       // Always start the SHOW_PRESS timer before the LONG_PRESS timer to ensure
       // proper timeout ordering.
-      timeout_handler_->StartTimeout(SHOW_PRESS);
+      if (showpress_enabled_)
+        timeout_handler_->StartTimeout(SHOW_PRESS);
       if (longpress_enabled_)
         timeout_handler_->StartTimeout(LONG_PRESS);
       handled |= listener_->OnDown(ev);
       break;
 
     case MotionEvent::ACTION_MOVE:
       {
         const float scroll_x = last_focus_x_ - focus_x;
         const float scroll_y = last_focus_y_ - focus_y;
         if (is_double_tapping_) {
@@ skipping 215 matching lines @@
     return false;
 
   if (vx_abs > vy_abs)
     vy = 0;
   else
     vx = 0;
   return listener_->OnSwipe(*current_down_event_, up, vx, vy);
 }
 
 }  // namespace ui