| Index: ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| diff --git a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| index bcf4ce64f20edc2ee1288acea7c8d73797347bed..83c7411b82ae70aa223af7accde591080ee4a7c0 100644
|
| --- a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| +++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| @@ -187,8 +187,8 @@ TouchDispositionGestureFilter::OnGesturePacket(
|
| return SUCCESS;
|
| }
|
|
|
| -void TouchDispositionGestureFilter::OnTouchEventAck(uint32_t unique_event_id,
|
| - bool event_consumed) {
|
| +void TouchDispositionGestureFilter::OnTouchEventAck(
|
| + uint32_t unique_touch_event_id, bool event_consumed) {
|
| // Spurious asynchronous acks should not trigger a crash.
|
| if (IsEmpty() || (Head().empty() && sequences_.size() == 1))
|
| return;
|
| @@ -197,13 +197,13 @@ void TouchDispositionGestureFilter::OnTouchEventAck(uint32_t unique_event_id,
|
| PopGestureSequence();
|
|
|
| if (!Tail().empty() &&
|
| - Tail().back().unique_touch_event_id() == unique_event_id) {
|
| + Tail().back().unique_touch_event_id() == unique_touch_event_id) {
|
| Tail().back().Ack(event_consumed);
|
| if (sequences_.size() == 1 && Tail().size() == 1)
|
| SendAckedEvents();
|
| } else {
|
| DCHECK(!Head().empty());
|
| - DCHECK_EQ(Head().front().unique_touch_event_id(), unique_event_id);
|
| + DCHECK_EQ(Head().front().unique_touch_event_id(), unique_touch_event_id);
|
| Head().front().Ack(event_consumed);
|
| SendAckedEvents();
|
| }
|
|
|