| 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 260ada94d881688d4fe17af183a09bc5c2b6cfcc..b8e83b25a2905326565ebee8e67fee9c11a263de 100644
|
| --- a/ui/events/gestures/gesture_provider_aura.cc
|
| +++ b/ui/events/gestures/gesture_provider_aura.cc
|
| @@ -42,16 +42,13 @@
|
| return true;
|
| }
|
|
|
| -void GestureProviderAura::OnTouchEventAck(
|
| - uint32_t unique_touch_event_id,
|
| - bool event_consumed,
|
| - bool is_source_touch_event_set_non_blocking) {
|
| +void GestureProviderAura::OnTouchEventAck(uint32_t unique_touch_event_id,
|
| + bool event_consumed) {
|
| DCHECK(pending_gestures_.empty());
|
| DCHECK(!handling_event_);
|
| base::AutoReset<bool> handling_event(&handling_event_, true);
|
| - filtered_gesture_provider_.OnTouchEventAck(
|
| - unique_touch_event_id, event_consumed,
|
| - is_source_touch_event_set_non_blocking);
|
| + filtered_gesture_provider_.OnTouchEventAck(unique_touch_event_id,
|
| + event_consumed);
|
| }
|
|
|
| void GestureProviderAura::OnGestureEvent(const GestureEventData& gesture) {
|
| @@ -85,8 +82,7 @@
|
| touch_event->set_root_location_f(point);
|
|
|
| OnTouchEvent(touch_event.get());
|
| - OnTouchEventAck(touch_event->unique_event_id(), true /* event_consumed */,
|
| - false /* is_source_touch_event_set_non_blocking */);
|
| + OnTouchEventAck(touch_event->unique_event_id(), true);
|
| }
|
|
|
| } // namespace content
|
|
|