Suppressed MEs for gestures from cancelled PEs

ui/events/gestures/gesture_provider_aura.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/gestures/gesture_provider_aura.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 
   auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
   if (!result.succeeded)
     return false;
 
   event->set_may_cause_scrolling(result.moved_beyond_slop_region);
   pointer_state_.CleanupRemovedTouchPoints(*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.
     client_->OnGestureEvent(gesture_consumer_, event.get());
   } else {
     // Memory managed by ScopedVector pending_gestures_.
     pending_gestures_.push_back(std::move(event));
   }
 }
 
@@ skipping 13 matching lines @@
       ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f));
   gfx::PointF point(x, y);
   touch_event->set_location_f(point);
   touch_event->set_root_location_f(point);
 
   OnTouchEvent(touch_event.get());
   OnTouchEventAck(touch_event->unique_event_id(), true);
 }
 
 }  // namespace content