Suppressed MEs for gestures from cancelled PEs

ui/events/gestures/gesture_provider_aura.cc

Index: ui/events/gestures/gesture_provider_aura.cc
diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
index 57530fd611c1804ff846fdd5bde18b8a32899c48..1e14dcbbe6490166744a19f0d4558000b974520b 100644
--- a/ui/events/gestures/gesture_provider_aura.cc
+++ b/ui/events/gestures/gesture_provider_aura.cc
@@ -42,18 +42,20 @@ bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
   return true;
 }
 
-void GestureProviderAura::OnTouchEventAck(uint32_t unique_event_id,
-                                          bool event_consumed) {
+void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id,
+    bool event_consumed) {
   DCHECK(pending_gestures_.empty());
   DCHECK(!handling_event_);
   base::AutoReset<bool> handling_event(&handling_event_, true);
-  filtered_gesture_provider_.OnTouchEventAck(unique_event_id, event_consumed);
+  filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id,
+      event_consumed);
 }
 
-void GestureProviderAura::OnGestureEvent(
-    const GestureEventData& gesture) {
-  std::unique_ptr<ui::GestureEvent> event(new ui::GestureEvent(
-      gesture.x, gesture.y, gesture.flags, gesture.time, gesture.details));
+void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) {
+  std::unique_ptr<ui::GestureEvent> event(
+      new ui::GestureEvent(gesture.x, gesture.y, gesture.flags,
+                           gesture.time, gesture.details,
+                           gesture.unique_touch_event_id));
 
   if (!handling_event_) {
     // Dispatching event caused by timer.