Add support for touch-action: manipulation

content/browser/renderer_host/input/touch_action_filter_unittest.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/touch_action_filter.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/port/browser/event_with_latency_info.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
@@ skipping 397 matching lines @@
 
   // Pinch is not allowed with touch-action: pan-x pan-y.
   filter.ResetTouchAction();
   filter.OnSetTouchAction(TOUCH_ACTION_PAN_X_Y);
   EXPECT_FALSE(filter.FilterGestureEvent(&scroll_begin));
   EXPECT_TRUE(filter.FilterGestureEvent(&pinch_begin));
   EXPECT_TRUE(filter.FilterGestureEvent(&pinch_update));
   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));
   EXPECT_FALSE(filter.FilterGestureEvent(&pinch_begin));
   EXPECT_FALSE(filter.FilterGestureEvent(&pinch_update));
   EXPECT_FALSE(filter.FilterGestureEvent(&pinch_end));
   EXPECT_FALSE(filter.FilterGestureEvent(&scroll_end));
 
   // Pinching can become disallowed during a single scroll gesture, but
   // can't become allowed again until the scroll terminates.
@@ skipping 69 matching lines @@
       WebInputEvent::GestureTapDown, WebGestureEvent::Touchscreen);
   WebGestureEvent unconfirmed_tap = SyntheticWebGestureEventBuilder::Build(
       WebInputEvent::GestureTapUnconfirmed, WebGestureEvent::Touchscreen);
   WebGestureEvent tap_cancel = SyntheticWebGestureEventBuilder::Build(
       WebInputEvent::GestureTapCancel, WebGestureEvent::Touchscreen);
   WebGestureEvent double_tap = SyntheticWebGestureEventBuilder::Build(
       WebInputEvent::GestureDoubleTap, WebGestureEvent::Touchscreen);
 
   // 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);
   // Changing the touch action for the second tap doesn't effect the behaviour
   // of the event. The tap cancel will come as part of the next touch sequence.
   filter.ResetTouchAction();
   filter.OnSetTouchAction(TOUCH_ACTION_AUTO);
   EXPECT_TRUE(filter.FilterGestureEvent(&tap_cancel));
   EXPECT_FALSE(filter.FilterGestureEvent(&tap_down));
   EXPECT_FALSE(filter.FilterGestureEvent(&double_tap));
@@ skipping 57 matching lines @@
 
   filter.ResetTouchAction();
   filter.OnSetTouchAction(TOUCH_ACTION_NONE);
   EXPECT_FALSE(filter.FilterGestureEvent(&tap));
 
   filter.ResetTouchAction();
   EXPECT_FALSE(filter.FilterGestureEvent(&scroll_begin));
 }
 
 }  // namespace content