Send touch cancel to renderer when scrolling starts

content/browser/renderer_host/input/touch_event_queue_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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/input/mock_web_input_event_builders.h"
 #include "content/browser/renderer_host/input/touch_event_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 100 matching lines @@
   }
 
   const WebTouchEvent& acked_event() const {
     return last_acked_event_;
   }
 
   InputEventAckState acked_event_state() const {
     return last_acked_event_state_;
   }
 
-  void set_no_touch_move_to_renderer(bool no_touch_move) {
-    queue_->set_no_touch_move_to_renderer(no_touch_move);
+  void set_no_touch_to_renderer(bool no_touch) {
+    queue_->no_touch_to_renderer_ = no_touch;
   }
 
-  bool no_touch_move_to_renderer() const {
-    return queue_->no_touch_move_to_renderer_;
+  bool no_touch_to_renderer() const {
+    return queue_->no_touch_to_renderer_;
   }
 
  private:
   scoped_ptr<TouchEventQueue> queue_;
   size_t sent_event_count_;
   size_t acked_event_count_;
   WebTouchEvent last_sent_event_;
   WebTouchEvent last_acked_event_;
   InputEventAckState last_acked_event_state_;
   MockWebTouchEvent touch_event_;
@@ skipping 497 matching lines @@
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Touch moves may trigger scroll.
   MoveTouchPoint(0, 20, 5);
   SendTouchEvent();
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventACK(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Touch move should not be sent to renderer (e.g., when scrolling starts).
-  set_no_touch_move_to_renderer(true);
+  set_no_touch_to_renderer(true);
   MoveTouchPoint(0, 30, 5);
   SendTouchEvent();
   EXPECT_EQ(0U, GetAndResetSentEventCount());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Touch move should not be sent to renderer.
   MoveTouchPoint(0, 65, 10);
   SendTouchEvent();
   EXPECT_EQ(0U, GetAndResetSentEventCount());
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
-  // Touch end should still be sent to renderer.
+  // Touch end should not be sent to renderer.
   ReleaseTouchPoint(0);
   SendTouchEvent();
-  EXPECT_EQ(1U, GetAndResetSentEventCount());
-  EXPECT_EQ(0U, GetAndResetAckedEventCount());
+  EXPECT_EQ(0U, GetAndResetSentEventCount());
+  EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   // Resume sending touch moves to renderer (e.g., when scrolling ends).
-  set_no_touch_move_to_renderer(false);
-  SendTouchEventACK(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-  EXPECT_EQ(1U, GetAndResetAckedEventCount());
+  set_no_touch_to_renderer(false);
 
   // Now touch events should come through to renderer.
   PressTouchPoint(80, 10);
   SendTouchEvent();
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventACK(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   MoveTouchPoint(0, 80, 20);
   SendTouchEvent();
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventACK(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 
   ReleaseTouchPoint(0);
   SendTouchEvent();
   EXPECT_EQ(1U, GetAndResetSentEventCount());
   SendTouchEventACK(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   EXPECT_EQ(1U, GetAndResetAckedEventCount());
 }
 
 }  // namespace content