Index: content/browser/renderer_host/input/touch_action_filter.cc |
diff --git a/content/browser/renderer_host/input/touch_action_filter.cc b/content/browser/renderer_host/input/touch_action_filter.cc |
index eea8082cf90a8e9357d79ed71d983fd5d08256c1..88bb366e19a4f479fc68cdab637f61cedd5f58e3 100644 |
--- a/content/browser/renderer_host/input/touch_action_filter.cc |
+++ b/content/browser/renderer_host/input/touch_action_filter.cc |
@@ -118,7 +118,6 @@ bool TouchActionFilter::FilterGestureEvent(WebGestureEvent* gesture_event) { |
} |
bool TouchActionFilter::FilterScrollEndingGesture() { |
- allowed_touch_action_ = TOUCH_ACTION_AUTO; |
DCHECK(!drop_pinch_gesture_events_); |
if (drop_scroll_gesture_events_) { |
drop_scroll_gesture_events_ = false; |
@@ -142,6 +141,12 @@ void TouchActionFilter::OnSetTouchAction(TouchAction touch_action) { |
allowed_touch_action_ = Intersect(allowed_touch_action_, touch_action); |
} |
+void TouchActionFilter::OnTouchSequenceStart() { |
+ DCHECK(!drop_scroll_gesture_events_); |
+ DCHECK(!drop_pinch_gesture_events_); |
+ allowed_touch_action_ = TOUCH_ACTION_AUTO; |
+} |
+ |
bool TouchActionFilter::ShouldSuppressScroll( |
const blink::WebGestureEvent& gesture_event) { |
DCHECK_EQ(gesture_event.type, WebInputEvent::GestureScrollBegin); |