| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index b9898a869d9c3e42e0e206cce3d8230a93d8aee9..7cf58c978d541ca4f8bb680796413804f30174f3 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -60,6 +60,7 @@
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
|
| +#include "content/browser/renderer_host/ui_events_helper.h"
|
| #include "content/common/gpu_stream_constants.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/site_isolation_policy.h"
|
| @@ -1666,8 +1667,9 @@ gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() {
|
| void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent(
|
| const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
|
| const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
|
| - gesture_provider_.OnTouchEventAck(touch.event.unique_touch_event_id,
|
| - event_consumed);
|
| + gesture_provider_.OnTouchEventAck(
|
| + touch.event.unique_touch_event_id, event_consumed,
|
| + InputEventAckStateIsSetNonBlocking(ack_result));
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::GestureEventAck(
|
|
|