| 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 774350353309cf1ddb1d63a94ce3c6dee94433f3..4d1fcdd7acd8a29dbef5136aaf0884a9dbb208c6 100644
|
| --- a/ui/events/gestures/gesture_recognizer_impl.cc
|
| +++ b/ui/events/gestures/gesture_recognizer_impl.cc
|
| @@ -251,7 +251,7 @@ bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
|
| return gesture_provider->OnTouchEvent(event);
|
| }
|
|
|
| -// TODO(tdresser): we should take a unique_event_id here, and validate
|
| +// TODO(tdresser): we should take a unique_touch_event_id here, and validate
|
| // that the correct event is being acked. See crbug.com/457669 for
|
| // details.
|
| GestureRecognizer::Gestures*
|
| @@ -265,12 +265,12 @@ GestureRecognizerImpl::AckAsyncTouchEvent(
|
| }
|
|
|
| GestureRecognizer::Gestures* GestureRecognizerImpl::AckSyncTouchEvent(
|
| - const uint64 unique_event_id,
|
| + const uint32 unique_touch_event_id,
|
| ui::EventResult result,
|
| GestureConsumer* consumer) {
|
| GestureProviderAura* gesture_provider =
|
| GetGestureProviderForConsumer(consumer);
|
| - gesture_provider->OnSyncTouchEventAck(unique_event_id,
|
| + gesture_provider->OnSyncTouchEventAck(unique_touch_event_id,
|
| result != ER_UNHANDLED);
|
| return gesture_provider->GetAndResetPendingGestures();
|
| }
|
|
|