Don't send touchcancel on touch scroll start

content/browser/renderer_host/input/touch_action_browsertest.cc

 // Copyright 2014 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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 #include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h"
+#include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input_messages.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 150 matching lines @@
 // Verify the test infrastructure works - we can touch-scroll the page and get a
 // touchcancel as expected.
 IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, MAYBE_DefaultAuto) {
   LoadURL();
 
   bool scrolled = DoTouchScroll(gfx::Point(50, 50), gfx::Vector2d(0, 45));
   EXPECT_TRUE(scrolled);
 
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart"));
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchmove"));
-  // Note, if we ship touch-absorption (crbug.com/346693) this will change to
-  // 1 end event and 0 cancel events.
-  EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchend"));
-  EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
+  if (TouchEventQueue::TOUCH_SCROLLING_MODE_DEFAULT ==
+      TouchEventQueue::TOUCH_SCROLLING_MODE_TOUCHCANCEL) {
+    EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchend"));
+    EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
+  } else {
+    EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend"));
+    EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
+  }
 }
 
 // Verify that touching a touch-action: none region disables scrolling and
 // enables all touch events to be sent.
 IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, TouchActionNone) {
   LoadURL();
 
   bool scrolled = DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45));
   EXPECT_FALSE(scrolled);
 
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart"));
   EXPECT_GT(ExecuteScriptAndExtractInt("eventCounts.touchmove"), 1);
   EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend"));
   EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel"));
 }
 
 }  // namespace content