| Index: ui/events/gestures/gesture_provider_aura.cc
|
| diff --git a/ui/events/gestures/gesture_provider_aura.cc b/ui/events/gestures/gesture_provider_aura.cc
|
| index f053f9b14ace92285009eb03c7d8d5226ff03f6a..c610fdee3fa23c5c373284eb1dd572dcbbed9f40 100644
|
| --- a/ui/events/gestures/gesture_provider_aura.cc
|
| +++ b/ui/events/gestures/gesture_provider_aura.cc
|
| @@ -30,7 +30,7 @@ bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
|
| if (!pointer_state_.OnTouch(*event))
|
| return false;
|
|
|
| - last_unique_touch_event_id_ = event->unique_event_id();
|
| + last_unique_touch_event_id_ = event->unique_touch_event_id();
|
| last_touch_event_latency_info_ = *event->latency();
|
|
|
| auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
|
| @@ -50,9 +50,9 @@ void GestureProviderAura::OnAsyncTouchEventAck(bool event_consumed) {
|
| last_touch_event_latency_info_.Clear();
|
| }
|
|
|
| -void GestureProviderAura::OnSyncTouchEventAck(const uint64 unique_event_id,
|
| - bool event_consumed) {
|
| - DCHECK_EQ(last_unique_touch_event_id_, unique_event_id);
|
| +void GestureProviderAura::OnSyncTouchEventAck(
|
| + const uint32 unique_touch_event_id, bool event_consumed) {
|
| + DCHECK_EQ(last_unique_touch_event_id_, unique_touch_event_id);
|
| DCHECK(pending_gestures_.empty());
|
| DCHECK(!handling_event_);
|
| base::AutoReset<bool> handling_event(&handling_event_, true);
|
|
|