| Index: content/browser/renderer_host/input/touch_emulator.cc
|
| diff --git a/content/browser/renderer_host/input/touch_emulator.cc b/content/browser/renderer_host/input/touch_emulator.cc
|
| index 4f6eb86e3eea8723f5d158c952e0b9b2d6f39624..f0e3f01b960cfab34083c501d3cdd379ba3ecea8 100644
|
| --- a/content/browser/renderer_host/input/touch_emulator.cc
|
| +++ b/content/browser/renderer_host/input/touch_emulator.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "build/build_config.h"
|
| #include "content/browser/renderer_host/input/motion_event_web.h"
|
| +#include "content/browser/renderer_host/ui_events_helper.h"
|
| #include "content/common/input/web_touch_event_traits.h"
|
| #include "content/grit/content_resources.h"
|
| #include "content/public/common/content_client.h"
|
| @@ -258,10 +259,12 @@
|
| return;
|
|
|
| const bool event_consumed = true;
|
| + const bool is_source_touch_event_set_non_blocking = false;
|
| // Block emulated event when emulated native stream is active.
|
| if (native_stream_active_sequence_count_) {
|
| gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
|
| - event_consumed);
|
| + event_consumed,
|
| + is_source_touch_event_set_non_blocking);
|
| return;
|
| }
|
|
|
| @@ -269,7 +272,8 @@
|
| // Do not allow middle-sequence event to pass through, if start was blocked.
|
| if (!emulated_stream_active_sequence_count_ && !is_sequence_start) {
|
| gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
|
| - event_consumed);
|
| + event_consumed,
|
| + is_source_touch_event_set_non_blocking);
|
| return;
|
| }
|
|
|
| @@ -289,8 +293,9 @@
|
|
|
| const bool event_consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED;
|
| if (gesture_provider_)
|
| - gesture_provider_->OnTouchEventAck(event.unique_touch_event_id,
|
| - event_consumed);
|
| + gesture_provider_->OnTouchEventAck(
|
| + event.unique_touch_event_id, event_consumed,
|
| + InputEventAckStateIsSetNonBlocking(ack_result));
|
| return true;
|
| }
|
|
|
|
|