Index: content/browser/renderer_host/input/touch_action_filter.h |
diff --git a/content/browser/renderer_host/input/touch_action_filter.h b/content/browser/renderer_host/input/touch_action_filter.h |
index 6485c45a935cf6996180e8f767d0345b8cdb5294..35e6fa78560c216bbc293384c4f1218d1ec20b4f 100644 |
--- a/content/browser/renderer_host/input/touch_action_filter.h |
+++ b/content/browser/renderer_host/input/touch_action_filter.h |
@@ -25,13 +25,19 @@ public: |
// Returns true if the supplied gesture event should be dropped based on |
// the current touch-action state. |
- bool FilterGestureEvent(const blink::WebGestureEvent& gesture_event); |
+ bool FilterGestureEvent(blink::WebGestureEvent* gesture_event); |
// Called when a set-touch-action message is received from the renderer |
// for a touch start event that is currently in flight. |
void OnSetTouchAction(content::TouchAction touch_action); |
+ // Return the intersection of two TouchAction values. |
+ static TouchAction Intersect(TouchAction ta1, TouchAction ta2); |
+ |
private: |
+ bool ShouldSuppressScroll(const blink::WebGestureEvent& gesture_event); |
+ bool FilterGestureEnd(); |
+ |
// Whether GestureScroll events should be discarded due to touch-action. |
bool drop_scroll_gesture_events_; |