Suppressed MEs for gestures from cancelled PEs

ui/events/gesture_detection/gesture_event_data_packet.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_event_data_packet.h"
 
 #include "base/logging.h"
 #include "ui/events/gesture_detection/motion_event.h"
 
 namespace ui {
@@ skipping 64 matching lines @@
   timestamp_ = other.timestamp_;
   gesture_source_ = other.gesture_source_;
   touch_location_ = other.touch_location_;
   raw_touch_location_ = other.raw_touch_location_;
   gestures_ = other.gestures_;
   ack_state_ = other.ack_state_;
   unique_touch_event_id_ = other.unique_touch_event_id_;
   return *this;
 }
 
-void GestureEventDataPacket::Push(const GestureEventData& gesture) {
-  DCHECK_NE(ET_UNKNOWN, gesture.type());
+void GestureEventDataPacket::Push(const GestureEventData& original_gesture) {
+  DCHECK_NE(ET_UNKNOWN, original_gesture.type());
+  GestureEventData gesture(original_gesture);
+  gesture.unique_touch_event_id = unique_touch_event_id_;
   gestures_->push_back(gesture);
 }
 
 GestureEventDataPacket GestureEventDataPacket::FromTouch(
     const ui::MotionEvent& touch) {
   return GestureEventDataPacket(touch.GetEventTime(), ToGestureSource(touch),
                                 gfx::PointF(touch.GetX(), touch.GetY()),
                                 gfx::PointF(touch.GetRawX(), touch.GetRawY()),
                                 touch.GetUniqueEventId());
 }
 
 GestureEventDataPacket GestureEventDataPacket::FromTouchTimeout(
     const GestureEventData& gesture) {
   GestureEventDataPacket packet(gesture.time, TOUCH_TIMEOUT,
                                 gfx::PointF(gesture.x, gesture.y),
-                                gfx::PointF(gesture.raw_x, gesture.raw_y), 0);
+                                gfx::PointF(gesture.raw_x, gesture.raw_y),
+                                gesture.unique_touch_event_id);
   packet.Push(gesture);
   return packet;
 }
 
 void GestureEventDataPacket::Ack(bool event_consumed) {
   DCHECK_EQ(static_cast<int>(ack_state_), static_cast<int>(AckState::PENDING));
   ack_state_ = event_consumed ? AckState::CONSUMED : AckState::UNCONSUMED;
 }
 
 }  // namespace ui