Add multi-finger swipe detection to GestureDetector

ui/events/gesture_detection/gesture_provider.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.
 
 #include "ui/events/gesture_detection/gesture_provider.h"
 
 #include <cmath>
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
@@ skipping 240 matching lines @@
 
   bool OnTouchEvent(const MotionEvent& e,
                     bool is_scale_gesture_detection_in_progress) {
     snap_scroll_controller_.SetSnapScrollingMode(
         e, is_scale_gesture_detection_in_progress);
 
     if (is_scale_gesture_detection_in_progress)
       SetIgnoreSingleTap(true);
 
     if (e.GetAction() == MotionEvent::ACTION_DOWN)
-      gesture_detector_.set_is_longpress_enabled(true);
+      gesture_detector_.set_longpress_enabled(true);
 
     return gesture_detector_.OnTouchEvent(e);
   }
 
   // GestureDetector::GestureListener implementation.
   virtual bool OnDown(const MotionEvent& e) OVERRIDE {
     current_down_time_ = e.GetEventTime();
     ignore_single_tap_ = false;
     seen_first_scroll_event_ = false;
 
@@ skipping 70 matching lines @@
         velocity_y = 0;
       } else {
         velocity_x = 0;
       }
     }
 
     provider_->Fling(e2, velocity_x, velocity_y);
     return true;
   }
 
+  virtual bool OnSwipe(const MotionEvent& e1,
+                       const MotionEvent& e2,
+                       float velocity_x,
+                       float velocity_y) OVERRIDE {
+    GestureEventDetails swipe_details(
+        ET_GESTURE_MULTIFINGER_SWIPE, velocity_x, velocity_y);
+    provider_->Send(
+        CreateGesture(ET_GESTURE_MULTIFINGER_SWIPE, e2, swipe_details));
+    return true;
+  }
+
   virtual void OnShowPress(const MotionEvent& e) OVERRIDE {
     GestureEventDetails show_press_details(ET_GESTURE_SHOW_PRESS, 0, 0);
     // TODO(jdduke): Expose minor axis length and rotation in |MotionEvent|.
     show_press_details.set_bounding_box(
         gfx::RectF(e.GetTouchMajor(), e.GetTouchMajor()));
     provider_->Send(
         CreateGesture(ET_GESTURE_SHOW_PRESS, e, show_press_details));
   }
 
   virtual bool OnSingleTapUp(const MotionEvent& e) OVERRIDE {
@@ skipping 37 matching lines @@
     provider_->Send(CreateGesture(
         ET_GESTURE_TAP, e, CreateTapGestureDetails(ET_GESTURE_TAP, e)));
     return true;
   }
 
   virtual bool OnDoubleTap(const MotionEvent& e) OVERRIDE { return false; }
 
   virtual bool OnDoubleTapEvent(const MotionEvent& e) OVERRIDE {
     switch (e.GetAction()) {
       case MotionEvent::ACTION_DOWN:
-        gesture_detector_.set_is_longpress_enabled(false);
+        gesture_detector_.set_longpress_enabled(false);
         break;
 
       case MotionEvent::ACTION_UP:
         if (!provider_->IsPinchInProgress() &&
             !provider_->IsScrollInProgress()) {
           provider_->Send(
               CreateGesture(ET_GESTURE_DOUBLE_TAP,
                             e,
                             CreateTapGestureDetails(ET_GESTURE_DOUBLE_TAP, e)));
           return true;
@@ skipping 309 matching lines @@
   if (current_down_event_)
     return;
 
   const bool double_tap_enabled = double_tap_support_for_page_ &&
                                   double_tap_support_for_platform_;
   gesture_listener_->SetDoubleTapEnabled(double_tap_enabled);
   scale_gesture_listener_->SetDoubleTapEnabled(double_tap_enabled);
 }
 
 }  //  namespace ui