Send touch cancel to renderer when scrolling starts

content/browser/renderer_host/input/immediate_input_router_unittest.cc

Index: content/browser/renderer_host/input/immediate_input_router_unittest.cc
diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/immediate_input_router_unittest.cc
index 3d540e07fe946b37745feb4975de7744046a0e7f..02f85b9ccf9ce6e573188ebe55d4a2e7eea6506d 100644
--- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc
+++ b/content/browser/renderer_host/input/immediate_input_router_unittest.cc
@@ -149,8 +149,8 @@ class ImmediateInputRouterTest : public InputRouterTest {
     input_router()->enable_no_touch_to_renderer_while_scrolling_ = true;
   }
 
-  bool no_touch_move_to_renderer() {
-    return touch_event_queue()->no_touch_move_to_renderer_;
+  bool no_touch_to_renderer() {
+    return touch_event_queue()->no_touch_to_renderer_;
   }
 
   TouchEventQueue* touch_event_queue() const {
@@ -1766,8 +1766,8 @@ TEST_F(ImmediateInputRouterTest, UnhandledWheelEvent) {
   EXPECT_EQ(ack_handler_->acked_wheel_event().deltaY, -5);
 }
 
-// Tests that no touch move events are sent to renderer during scrolling.
-TEST_F(ImmediateInputRouterTest, NoTouchMoveWhileScroll) {
+// Tests that no touch events are sent to renderer during scrolling.
+TEST_F(ImmediateInputRouterTest, NoTouchWhileScroll) {
   EnableNoTouchToRendererWhileScrolling();
   set_debounce_interval_time_ms(0);
   input_router_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
@@ -1789,10 +1789,15 @@ TEST_F(ImmediateInputRouterTest, NoTouchMoveWhileScroll) {
   SendInputEventACK(WebInputEvent::TouchMove,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
 
+  EXPECT_EQ(0U, TouchEventQueueSize());
   SimulateGestureEvent(WebInputEvent::GestureScrollBegin,
                        WebGestureEvent::Touchscreen);
   EXPECT_EQ(1U, process_->sink().message_count());
-  EXPECT_TRUE(no_touch_move_to_renderer());
+  // This is the touch cancel event in the queue.
+  EXPECT_EQ(1U, TouchEventQueueSize());
+  EXPECT_TRUE(no_touch_to_renderer());
+  SendInputEventACK(WebInputEvent::TouchCancel,
+                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);

[sadrul, 2013/09/23 16:17:33]

The line in 1795 checks that only the scroll-begin event was sent. When is the
touch-cancel event dispatched? Why do you send the ack for touch-cancel here?

   process_->sink().ClearMessages();
   SendInputEventACK(WebInputEvent::GestureScrollBegin,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -1805,7 +1810,7 @@ TEST_F(ImmediateInputRouterTest, NoTouchMoveWhileScroll) {
 
   // Touch moves become ScrollUpdate.
   SimulateGestureScrollUpdateEvent(20, 4, 0);
-  EXPECT_TRUE(no_touch_move_to_renderer());
+  EXPECT_TRUE(no_touch_to_renderer());
   process_->sink().ClearMessages();
   SendInputEventACK(WebInputEvent::GestureScrollUpdate,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
@@ -1816,19 +1821,17 @@ TEST_F(ImmediateInputRouterTest, NoTouchMoveWhileScroll) {
   EXPECT_EQ(0U, process_->sink().message_count());
   process_->sink().ClearMessages();
 
-  // Touch end should still be sent to renderer.
+  // Touch end should not be sent to renderer.
   ReleaseTouchPoint(0);
   SendTouchEvent();
-  EXPECT_EQ(1U, process_->sink().message_count());
+  EXPECT_EQ(0U, process_->sink().message_count());
   process_->sink().ClearMessages();
-  SendInputEventACK(WebInputEvent::TouchEnd,
-                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
 
   // On GestureScrollEnd, resume sending touch moves to renderer.
   SimulateGestureEvent(WebKit::WebInputEvent::GestureScrollEnd,
                        WebGestureEvent::Touchscreen);
   EXPECT_EQ(1U, process_->sink().message_count());
-  EXPECT_FALSE(no_touch_move_to_renderer());
+  EXPECT_FALSE(no_touch_to_renderer());
   process_->sink().ClearMessages();
   SendInputEventACK(WebInputEvent::GestureScrollEnd,
                     INPUT_EVENT_ACK_STATE_NOT_CONSUMED);