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

Unified Diff: ui/events/gesture_detection/gesture_provider.cc

Issue 999423003: Set the unique_event_id when converting from TouchEvent to WebTouchEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/events.gyp ('k') | ui/events/gesture_detection/gesture_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_provider.cc
diff --git a/ui/events/gesture_detection/gesture_provider.cc b/ui/events/gesture_detection/gesture_provider.cc
index 0d3a55f6b5aa229c0161bc0163cbc712f3e40668..271ec06e5eddf549e6325132ea9a78f1d07dc8cb 100644
--- a/ui/events/gesture_detection/gesture_provider.cc
+++ b/ui/events/gesture_detection/gesture_provider.cc
@@ -217,7 +217,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
return false;
if (!pinch_event_sent_) {
Send(CreateGesture(ET_GESTURE_PINCH_BEGIN,
- e.GetId(),
+ e.GetPointerId(),
e.GetToolType(),
detector.GetEventTime(),
detector.GetFocusX(),
@@ -253,7 +253,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
GestureEventDetails pinch_details(ET_GESTURE_PINCH_UPDATE);
pinch_details.set_scale(scale);
Send(CreateGesture(pinch_details,
- e.GetId(),
+ e.GetPointerId(),
e.GetToolType(),
detector.GetEventTime(),
detector.GetFocusX(),
@@ -304,7 +304,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
// Use the co-ordinates from the touch down, as these co-ordinates are
// used to determine which layer the scroll should affect.
Send(CreateGesture(scroll_details,
- e2.GetId(),
+ e2.GetPointerId(),
e2.GetToolType(),
e2.GetEventTime(),
e1.GetX(),
@@ -333,7 +333,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
const gfx::PointF raw_center =
center + gfx::Vector2dF(e2.GetRawOffsetX(), e2.GetRawOffsetY());
Send(CreateGesture(scroll_details,
- e2.GetId(),
+ e2.GetPointerId(),
e2.GetToolType(),
e2.GetEventTime(),
center.x(),
@@ -393,7 +393,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
GestureEventDetails two_finger_tap_details(
ET_GESTURE_TWO_FINGER_TAP, e1.GetTouchMajor(), e1.GetTouchMajor());
Send(CreateGesture(two_finger_tap_details,
- e2.GetId(),
+ e2.GetPointerId(),
e2.GetToolType(),
e2.GetEventTime(),
e1.GetX(),
@@ -541,7 +541,7 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
GestureEventData CreateGesture(const GestureEventDetails& details,
const MotionEvent& event) {
return GestureEventData(details,
- event.GetId(),
+ event.GetPointerId(),
event.GetToolType(),
event.GetEventTime(),
event.GetX(),
@@ -772,7 +772,7 @@ void GestureProvider::OnTouchEventHandlingBegin(const MotionEvent& event) {
const int action_index = event.GetActionIndex();
gesture_listener_->Send(gesture_listener_->CreateGesture(
ET_GESTURE_BEGIN,
- event.GetId(),
+ event.GetPointerId(),
event.GetToolType(),
event.GetEventTime(),
event.GetX(action_index),
« no previous file with comments | « ui/events/events.gyp ('k') | ui/events/gesture_detection/gesture_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698