| 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 96e8bb9ac44dc6a81a71ab800d5ab60429ba28f8..368619cc1e633721beac4f37fa29314ea22bce62 100644
|
| --- a/content/browser/renderer_host/input/immediate_input_router.cc
|
| +++ b/content/browser/renderer_host/input/immediate_input_router.cc
|
| @@ -85,6 +85,9 @@ ImmediateInputRouter::ImmediateInputRouter(
|
| has_touch_handler_(false),
|
| touch_event_queue_(new TouchEventQueue(this)),
|
| gesture_event_filter_(new GestureEventFilter(this)) {
|
| + enable_no_touch_to_renderer_while_scrolling_ =
|
| + CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| + switches::kNoTouchToRendererWhileScrolling) == "1";
|
| DCHECK(process);
|
| DCHECK(client);
|
| }
|
| @@ -199,6 +202,7 @@ void ImmediateInputRouter::SendKeyboardEvent(
|
|
|
| void ImmediateInputRouter::SendGestureEvent(
|
| const GestureEventWithLatencyInfo& gesture_event) {
|
| + HandleGestureScroll(gesture_event);
|
| if (!client_->OnSendGestureEvent(gesture_event))
|
| return;
|
| FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
|
| @@ -252,6 +256,7 @@ void ImmediateInputRouter::SendTouchEventImmediately(
|
|
|
| void ImmediateInputRouter::SendGestureEventImmediately(
|
| const GestureEventWithLatencyInfo& gesture_event) {
|
| + HandleGestureScroll(gesture_event);
|
| if (!client_->OnSendGestureEventImmediately(gesture_event))
|
| return;
|
| FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency, false);
|
| @@ -556,4 +561,19 @@ void ImmediateInputRouter::ProcessTouchAck(
|
| touch_event_queue_->ProcessTouchAck(ack_result, latency_info);
|
| }
|
|
|
| +void ImmediateInputRouter::HandleGestureScroll(
|
| + const GestureEventWithLatencyInfo& gesture_event) {
|
| + if (!enable_no_touch_to_renderer_while_scrolling_)
|
| + return;
|
| +
|
| + // Once scrolling is started stop forwarding touch move events to renderer.
|
| + if (gesture_event.event.type == WebInputEvent::GestureScrollBegin)
|
| + touch_event_queue_->set_no_touch_move_to_renderer(true);
|
| +
|
| + if (gesture_event.event.type == WebInputEvent::GestureScrollEnd ||
|
| + gesture_event.event.type == WebInputEvent::GestureFlingStart) {
|
| + touch_event_queue_->set_no_touch_move_to_renderer(false);
|
| + }
|
| +}
|
| +
|
| } // namespace content
|
|
|