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

Unified Diff: ui/events/gestures/gesture_recognizer_impl.cc

Issue 2655303004: Add id properties to PointerEvent (Closed)
Patch Set: pointer id Created 3 years, 10 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
Index: ui/events/gestures/gesture_recognizer_impl.cc
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
index bc0776b5c399c1ddebe1a4051aa8ad8191b0d855..9f708fcb1905a760db4b4b283b12748f2f90543e 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -65,7 +65,7 @@ GestureRecognizerImpl::~GestureRecognizerImpl() {
// Otherwise, returns NULL.
GestureConsumer* GestureRecognizerImpl::GetTouchLockedTarget(
const TouchEvent& event) {
- return touch_id_target_[event.touch_id()];
+ return touch_id_target_[event.pointer_details().id];
}
GestureConsumer* GestureRecognizerImpl::GetTargetForLocation(
@@ -167,7 +167,8 @@ void GestureRecognizerImpl::TransferEventsTo(
GetGestureProviderForConsumer(current_consumer);
for (std::unique_ptr<TouchEvent>& event : cancelling_touches) {
- gesture_provider->OnTouchEnter(event->touch_id(), event->x(), event->y());
+ gesture_provider->OnTouchEnter(event->pointer_details().id, event->x(),
+ event->y());
helper->DispatchSyntheticTouchEvent(event.get());
}
}
@@ -243,9 +244,9 @@ void GestureRecognizerImpl::SetupTargets(const TouchEvent& event,
GestureConsumer* target) {
if (event.type() == ui::ET_TOUCH_RELEASED ||
event.type() == ui::ET_TOUCH_CANCELLED) {
- touch_id_target_.erase(event.touch_id());
+ touch_id_target_.erase(event.pointer_details().id);
} else if (event.type() == ui::ET_TOUCH_PRESSED) {
- touch_id_target_[event.touch_id()] = target;
+ touch_id_target_[event.pointer_details().id] = target;
}
}

Powered by Google App Engine
This is Rietveld 408576698