Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/gestures/gesture_recognizer_impl.h

 // 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.
 
 #ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 #define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 29 matching lines @@
       const TouchEvent& event) override;
   GestureConsumer* GetTargetForGestureEvent(
       const GestureEvent& event) override;
   GestureConsumer* GetTargetForLocation(
       const gfx::PointF& location, int source_device_id) override;
   void TransferEventsTo(GestureConsumer* current_consumer,
                         GestureConsumer* new_consumer) override;
   bool GetLastTouchPointForTarget(GestureConsumer* consumer,
                                   gfx::PointF* point) override;
   bool CancelActiveTouches(GestureConsumer* consumer) override;
+  void CancelActiveTouchesExcept(GestureConsumer* not_cancelled) override;
 
  protected:
   virtual GestureProviderImpl* GetGestureProviderForConsumer(
       GestureConsumer* c);
 
  private:
   // Sets up the target consumer for gestures based on the touch-event.
   void SetupTargets(const TouchEvent& event, GestureConsumer* consumer);
 
   void DispatchGestureEvent(GestureEvent* event);
 
   // Overridden from GestureRecognizer
-  bool ProcessTouchEventPreDispatch(const TouchEvent& event,
+  bool ProcessTouchEventPreDispatch(TouchEvent* event,
                                     GestureConsumer* consumer) override;
 
-  Gestures* ProcessTouchEventPostDispatch(
-      const TouchEvent& event,
-      ui::EventResult result,
-      GestureConsumer* consumer) override;
-
-  Gestures* ProcessTouchEventOnAsyncAck(
-      const TouchEvent& event,
-      ui::EventResult result,
-      GestureConsumer* consumer) override;
+  Gestures* AckTouchEvent(uint32 unique_event_id,
+                          ui::EventResult result,
+                          GestureConsumer* consumer) override;
 
   bool CleanupStateForConsumer(GestureConsumer* consumer) override;
   void AddGestureEventHelper(GestureEventHelper* helper) override;
   void RemoveGestureEventHelper(GestureEventHelper* helper) override;
 
   // Overridden from GestureProviderImplClient
   void OnGestureEvent(GestureEvent* event) override;
 
   // Convenience method to find the GestureEventHelper that can dispatch events
   // to a specific |consumer|.
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
 };
 
 // Provided only for testing:
 EVENTS_EXPORT void SetGestureRecognizerForTesting(
     GestureRecognizer* gesture_recognizer);
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_H_