Reset the touch-action on the touch gesture end sequence.

content/browser/renderer_host/input/input_router_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/input_router_impl.h"
 
 #include <math.h>
 
 #include <utility>
 
@@ skipping 193 matching lines @@
 void InputRouterImpl::SendMouseEventImmediately(
     const MouseEventWithLatencyInfo& mouse_event) {
   if (mouse_event.event.type() == blink::WebInputEvent::MouseMove)
     mouse_move_queue_.push_back(mouse_event);
 
   FilterAndSendWebInputEvent(mouse_event.event, mouse_event.latency);
 }
 
 void InputRouterImpl::SendTouchEventImmediately(
     const TouchEventWithLatencyInfo& touch_event) {
-  if (WebTouchEventTraits::IsTouchSequenceStart(touch_event.event)) {
-    touch_action_filter_.ResetTouchAction();
-    // Note that if the previous touch-action was TOUCH_ACTION_NONE, enabling
-    // the timeout here will not take effect until the *following* touch
-    // sequence.  This is a desirable side-effect, giving the renderer a chance
-    // to send a touch-action response without racing against the ack timeout.
-    UpdateTouchAckTimeoutEnabled();
-  }
-
   FilterAndSendWebInputEvent(touch_event.event, touch_event.latency);
 }
 
 void InputRouterImpl::SendGestureEventImmediately(
     const GestureEventWithLatencyInfo& gesture_event) {
   FilterAndSendWebInputEvent(gesture_event.event, gesture_event.latency);
 }
 
 const NativeWebKeyboardEvent* InputRouterImpl::GetLastKeyboardEvent() const {
   if (key_queue_.empty())
@@ skipping 44 matching lines @@
 void InputRouterImpl::OnTouchEventAck(const TouchEventWithLatencyInfo& event,
                                       InputEventAckState ack_result) {
   // Touchstart events sent to the renderer indicate a new touch sequence, but
   // in some cases we may filter out sending the touchstart - catch those here.
   if (WebTouchEventTraits::IsTouchSequenceStart(event.event) &&
       ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS) {
     touch_action_filter_.ResetTouchAction();
     UpdateTouchAckTimeoutEnabled();
   }
   ack_handler_->OnTouchEventAck(event, ack_result);
+
+  // Reset the touch action at the end of a touch-action sequence.
+  if (WebTouchEventTraits::IsTouchSequenceEnd(event.event)) {
+    touch_action_filter_.ResetTouchAction();
+    UpdateTouchAckTimeoutEnabled();
+  }
 }
 
 void InputRouterImpl::OnFilteringTouchEvent(
     const WebTouchEvent& touch_event) {
   // The event stream given to the renderer is not guaranteed to be
   // valid based on the current TouchEventStreamValidator rules. This event will
   // never be given to the renderer, but in order to ensure that the event
   // stream |output_stream_validator_| sees is valid, we give events which are
   // filtered out to the validator. crbug.com/589111 proposes adding an
   // additional validator for the events which are actually sent to the
@@ skipping 371 matching lines @@
         DCHECK(global_touch_position_.find(touch_point->id) ==
                global_touch_position_.end());
         global_touch_position_[touch_point->id] = gfx::Point(
             touch_point->screenPosition.x, touch_point->screenPosition.y);
       }
     }
   }
 }
 
 }  // namespace content