Suppressed MEs for gestures from cancelled PEs

ui/events/gesture_detection/touch_disposition_gesture_filter.cc

Index: ui/events/gesture_detection/touch_disposition_gesture_filter.cc
diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
index bcf4ce64f20edc2ee1288acea7c8d73797347bed..f6ecff5782a02bb3d7b7be11c23ab7f1d505abc0 100644
--- a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
+++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
@@ -33,7 +33,8 @@ GestureEventData CreateGesture(EventType type,
                           packet.raw_touch_location().y(),
                           1,
                           gfx::RectF(packet.touch_location(), gfx::SizeF()),
-                          flags);
+                          flags,
+                          0U);
 }
 
 enum RequiredTouches {
@@ -187,8 +188,8 @@ TouchDispositionGestureFilter::OnGesturePacket(
   return SUCCESS;
 }
 
-void TouchDispositionGestureFilter::OnTouchEventAck(uint32_t unique_event_id,
-                                                    bool event_consumed) {
+void TouchDispositionGestureFilter::OnTouchEventAck(
+    uint32_t unique_touch_event_id, bool event_consumed) {
   // Spurious asynchronous acks should not trigger a crash.
   if (IsEmpty() || (Head().empty() && sequences_.size() == 1))
     return;
@@ -197,13 +198,13 @@ void TouchDispositionGestureFilter::OnTouchEventAck(uint32_t unique_event_id,
     PopGestureSequence();
 
   if (!Tail().empty() &&
-      Tail().back().unique_touch_event_id() == unique_event_id) {
+      Tail().back().unique_touch_event_id() == unique_touch_event_id) {
     Tail().back().Ack(event_consumed);
     if (sequences_.size() == 1 && Tail().size() == 1)
       SendAckedEvents();
   } else {
     DCHECK(!Head().empty());
-    DCHECK_EQ(Head().front().unique_touch_event_id(), unique_event_id);
+    DCHECK_EQ(Head().front().unique_touch_event_id(), unique_touch_event_id);
     Head().front().Ack(event_consumed);
     SendAckedEvents();
   }
@@ -304,8 +305,11 @@ void TouchDispositionGestureFilter::FilterAndSendPacket(
 }
 
 void TouchDispositionGestureFilter::SendGesture(
-    const GestureEventData& event,
+    const GestureEventData& original_event,
     const GestureEventDataPacket& packet_being_sent) {
+  GestureEventData event(original_event);

[dtapuska, 2016/06/03 15:02:11]

Wouldn't it make more sense to set the touch_event_id on the push_back ?

https://cs.chromium.org/chromium/src/ui/events/gesture_detection/gesture_even...

[mustaq, 2016/06/03 20:34:45]

Good catch, thanks. I originally got confused with
GestureEventDataPacket::FromTouchTimeout() setting the packet id to zero, but at
the end that zero id is never set later on in the packet, at least in the cases
I experimented. So it doesn't matter.

Done.

+  event.unique_touch_event_id = packet_being_sent.unique_touch_event_id();
+
   // TODO(jdduke): Factor out gesture stream reparation code into a standalone
   // utility class.
   switch (event.type()) {