| 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 6668f0d753bc3f59aa1ea4c0207fd57730e9e680..a23bc35a4e84a421fef3098b2316882cfca9e7e3 100644
|
| --- a/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| +++ b/ui/events/gesture_detection/touch_disposition_gesture_filter.cc
|
| @@ -191,7 +191,9 @@
|
| }
|
|
|
| void TouchDispositionGestureFilter::OnTouchEventAck(
|
| - uint32_t unique_touch_event_id, bool event_consumed) {
|
| + uint32_t unique_touch_event_id,
|
| + bool event_consumed,
|
| + bool is_source_touch_event_set_non_blocking) {
|
| // Spurious asynchronous acks should not trigger a crash.
|
| if (IsEmpty() || (Head().empty() && sequences_.size() == 1))
|
| return;
|
| @@ -201,13 +203,13 @@
|
|
|
| if (!Tail().empty() &&
|
| Tail().back().unique_touch_event_id() == unique_touch_event_id) {
|
| - Tail().back().Ack(event_consumed);
|
| + Tail().back().Ack(event_consumed, is_source_touch_event_set_non_blocking);
|
| if (sequences_.size() == 1 && Tail().size() == 1)
|
| SendAckedEvents();
|
| } else {
|
| DCHECK(!Head().empty());
|
| DCHECK_EQ(Head().front().unique_touch_event_id(), unique_touch_event_id);
|
| - Head().front().Ack(event_consumed);
|
| + Head().front().Ack(event_consumed, is_source_touch_event_set_non_blocking);
|
| SendAckedEvents();
|
| }
|
| }
|
|
|