| Index: content/browser/renderer_host/input/immediate_input_router.cc
|
| diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc
|
| index a52c0ee90428238e9ea58c073bb33c0b28a8a08d..8a3f138a5164e4a0fb55411f06a5ac68cf701363 100644
|
| --- a/content/browser/renderer_host/input/immediate_input_router.cc
|
| +++ b/content/browser/renderer_host/input/immediate_input_router.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/browser/renderer_host/overscroll_controller.h"
|
| #include "content/common/content_constants_internal.h"
|
| #include "content/common/edit_command.h"
|
| +#include "content/common/input/touch_action.h"
|
| #include "content/common/input/web_input_event_traits.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/view_messages.h"
|
| @@ -180,6 +181,9 @@ void ImmediateInputRouter::SendKeyboardEvent(
|
|
|
| void ImmediateInputRouter::SendGestureEvent(
|
| const GestureEventWithLatencyInfo& gesture_event) {
|
| + if (touch_action_filter_.FilterGestureEvent(gesture_event.event))
|
| + return;
|
| +
|
| HandleGestureScroll(gesture_event);
|
|
|
| if (!IsInOverscrollGesture() &&
|
| @@ -255,6 +259,8 @@ bool ImmediateInputRouter::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnSelectRangeAck)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_HasTouchEventHandlers,
|
| OnHasTouchEventHandlers)
|
| + IPC_MESSAGE_HANDLER(InputHostMsg_SetTouchAction,
|
| + OnSetTouchAction)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
|
|
| @@ -474,6 +480,14 @@ void ImmediateInputRouter::OnHasTouchEventHandlers(bool has_handlers) {
|
| client_->OnHasTouchEventHandlers(has_handlers);
|
| }
|
|
|
| +void ImmediateInputRouter::OnSetTouchAction(
|
| + content::TouchAction touch_action) {
|
| + // Synthetic touchstart events should get filtered out in RenderWidget.
|
| + DCHECK(touch_event_queue_->IsPendingAckTouchStart());
|
| +
|
| + touch_action_filter_.OnSetTouchAction(touch_action);
|
| +}
|
| +
|
| void ImmediateInputRouter::ProcessInputEventAck(
|
| WebInputEvent::Type event_type,
|
| InputEventAckState ack_result,
|
|
|