Index: content/browser/renderer_host/input/touch_action_filter_unittest.cc |
diff --git a/content/browser/renderer_host/input/touch_action_filter_unittest.cc b/content/browser/renderer_host/input/touch_action_filter_unittest.cc |
index 7d362a40a0ff4431d255ad6d0b16f8624efb4b54..38221245f6b0bbed9a4c952d66d5766242be0147 100644 |
--- a/content/browser/renderer_host/input/touch_action_filter_unittest.cc |
+++ b/content/browser/renderer_host/input/touch_action_filter_unittest.cc |
@@ -415,6 +415,15 @@ TEST(TouchActionFilterTest, Pinch) { |
EXPECT_TRUE(filter.FilterGestureEvent(&pinch_end)); |
EXPECT_FALSE(filter.FilterGestureEvent(&scroll_end)); |
+ // Pinch is allowed with touch-action: manipulation. |
+ filter.ResetTouchAction(); |
+ filter.OnSetTouchAction(TOUCH_ACTION_MANIPULATION); |
+ EXPECT_FALSE(filter.FilterGestureEvent(&scroll_begin)); |
+ EXPECT_FALSE(filter.FilterGestureEvent(&pinch_begin)); |
+ EXPECT_FALSE(filter.FilterGestureEvent(&pinch_update)); |
+ EXPECT_FALSE(filter.FilterGestureEvent(&pinch_end)); |
+ EXPECT_FALSE(filter.FilterGestureEvent(&scroll_end)); |
+ |
// Pinch state is automatically reset at the end of a scroll. |
filter.ResetTouchAction(); |
EXPECT_FALSE(filter.FilterGestureEvent(&scroll_begin)); |
@@ -504,7 +513,7 @@ TEST(TouchActionFilterTest, DoubleTap) { |
// Double tap is disabled with any touch action other than auto. |
filter.ResetTouchAction(); |
- filter.OnSetTouchAction(TOUCH_ACTION_NONE); |
+ filter.OnSetTouchAction(TOUCH_ACTION_MANIPULATION); |
EXPECT_FALSE(filter.FilterGestureEvent(&tap_down)); |
EXPECT_FALSE(filter.FilterGestureEvent(&unconfirmed_tap)); |
EXPECT_EQ(WebInputEvent::GestureTap, unconfirmed_tap.type); |