Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1882)

Unified Diff: ui/events/blink/blink_event_util.cc

Issue 1989623002: Suppressed MEs for gestures from cancelled PEs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/blink/blink_event_util.h ('k') | ui/events/blink/blink_event_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index b9bddda21181c96e50680b09ba20b459025987c3..fcf950b03edab73d6ad5c35d2d2ee78ab0f84ecb 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -226,7 +226,8 @@ 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());
@@ -248,6 +249,8 @@ WebGestureEvent CreateWebGestureEvent(const GestureEventDetails& details,
break;
}
+ gesture.uniqueTouchEventId = unique_touch_event_id;
+
switch (details.type()) {
case ET_GESTURE_SHOW_PRESS:
gesture.type = WebInputEvent::GestureShowPress;
@@ -350,7 +353,8 @@ 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(
« no previous file with comments | « ui/events/blink/blink_event_util.h ('k') | ui/events/blink/blink_event_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698