Suppressed MEs for gestures from cancelled PEs

ui/events/blink/blink_event_util.cc

 // Copyright 2015 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/blink/blink_event_util.h"
 
 #include <stddef.h>
@@ skipping 208 matching lines @@
   if (flags & EF_TOUCH_ACCESSIBILITY)
     modifiers |= blink::WebInputEvent::IsTouchAccessibility;
 
   return modifiers;
 }
 
 WebGestureEvent CreateWebGestureEvent(const GestureEventDetails& details,
                                       base::TimeTicks timestamp,
                                       const gfx::PointF& location,
                                       const gfx::PointF& raw_location,
-                                      int flags) {
+                                      int flags,
+                                      uint32_t unique_touch_event_id) {
   WebGestureEvent gesture;
   gesture.timeStampSeconds = ui::EventTimeStampToSeconds(timestamp);
   gesture.x = gfx::ToFlooredInt(location.x());
   gesture.y = gfx::ToFlooredInt(location.y());
   gesture.globalX = gfx::ToFlooredInt(raw_location.x());
   gesture.globalY = gfx::ToFlooredInt(raw_location.y());
   gesture.modifiers = EventFlagsToWebEventModifiers(flags);
 
   switch (details.device_type()) {
     case GestureDeviceType::DEVICE_TOUCHSCREEN:
       gesture.sourceDevice = blink::WebGestureDeviceTouchscreen;
       break;
     case GestureDeviceType::DEVICE_TOUCHPAD:
       gesture.sourceDevice = blink::WebGestureDeviceTouchpad;
       break;
     case GestureDeviceType::DEVICE_UNKNOWN:
       NOTREACHED() << "Unknown device type is not allowed";
       gesture.sourceDevice = blink::WebGestureDeviceUninitialized;
       break;
   }
 
+  gesture.uniqueTouchEventId = unique_touch_event_id;
+
   switch (details.type()) {
     case ET_GESTURE_SHOW_PRESS:
       gesture.type = WebInputEvent::GestureShowPress;
       gesture.data.showPress.width = details.bounding_box_f().width();
       gesture.data.showPress.height = details.bounding_box_f().height();
       break;
     case ET_GESTURE_DOUBLE_TAP:
       gesture.type = WebInputEvent::GestureDoubleTap;
       DCHECK_EQ(1, details.tap_count());
       gesture.data.tap.tapCount = details.tap_count();
@@ skipping 82 matching lines @@
                    << details.type();
   }
 
   return gesture;
 }
 
 WebGestureEvent CreateWebGestureEventFromGestureEventData(
     const GestureEventData& data) {
   return CreateWebGestureEvent(data.details, data.time,
                                gfx::PointF(data.x, data.y),
-                               gfx::PointF(data.raw_x, data.raw_y), data.flags);
+                               gfx::PointF(data.raw_x, data.raw_y), data.flags,
+                               data.unique_touch_event_id);
 }
 
 std::unique_ptr<blink::WebInputEvent> ScaleWebInputEvent(
     const blink::WebInputEvent& event,
     float scale) {
   std::unique_ptr<blink::WebInputEvent> scaled_event;
   if (scale == 1.f)
     return scaled_event;
   if (event.type == blink::WebMouseEvent::MouseWheel) {
     blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent;
@@ skipping 106 matching lines @@
     case MotionEvent::TOOL_TYPE_MOUSE:
       return WebPointerProperties::PointerType::Mouse;
     case MotionEvent::TOOL_TYPE_ERASER:
       return WebPointerProperties::PointerType::Unknown;
   }
   NOTREACHED() << "Invalid MotionEvent::ToolType = " << tool_type;
   return WebPointerProperties::PointerType::Unknown;
 }
 
 }  // namespace ui