Make touch events uncancelable during fling when they are on the current active scroll layer

ui/events/blink/input_handler_proxy_unittest.cc

Index: ui/events/blink/input_handler_proxy_unittest.cc
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc
index 78608b2d4ea9c316c87ee4bfeab3098c1395be41..df530cbdac34b7a80f5184444dfd2cc36982a59a 100644
--- a/ui/events/blink/input_handler_proxy_unittest.cc
+++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -162,7 +162,8 @@ class MockInputHandler : public cc::InputHandler {
   MOCK_CONST_METHOD1(
       GetEventListenerProperties,
       cc::EventListenerProperties(cc::EventListenerClass event_class));
-  MOCK_METHOD1(DoTouchEventsBlockScrollAt, bool(const gfx::Point& point));
+  MOCK_METHOD1(EventListenerTypeForTouchStartAt,
+               cc::EventListenerProperties(const gfx::Point& point));
 
   MOCK_METHOD0(RequestUpdateForSynchronousInputHandler, void());
   MOCK_METHOD1(SetSynchronousInputHandlerRootScrollOffset,
@@ -1941,12 +1942,9 @@ TEST_P(InputHandlerProxyTest, MultiTouchPointHitTestNegative) {
       mock_input_handler_,
       GetEventListenerProperties(cc::EventListenerClass::kTouchEndOrCancel))
       .WillOnce(testing::Return(cc::EventListenerProperties::kNone));
-  EXPECT_CALL(mock_input_handler_, DoTouchEventsBlockScrollAt(testing::_))
-      .WillOnce(testing::Return(false));
-  EXPECT_CALL(mock_input_handler_,
-              DoTouchEventsBlockScrollAt(
-                  testing::Property(&gfx::Point::x, testing::Lt(0))))
-      .WillOnce(testing::Return(false));
+  EXPECT_CALL(mock_input_handler_, EventListenerTypeForTouchStartAt(testing::_))
+      .Times(2)
+      .WillRepeatedly(testing::Return(cc::EventListenerProperties::kNone));
 
   WebTouchEvent touch;
   touch.type = WebInputEvent::TouchStart;
@@ -1967,13 +1965,14 @@ TEST_P(InputHandlerProxyTest, MultiTouchPointHitTestPositive) {
   VERIFY_AND_RESET_MOCKS();
 
   EXPECT_CALL(mock_input_handler_,
-              DoTouchEventsBlockScrollAt(
+              EventListenerTypeForTouchStartAt(
                   testing::Property(&gfx::Point::x, testing::Eq(0))))
-      .WillOnce(testing::Return(false));
+      .WillOnce(testing::Return(cc::EventListenerProperties::kNone));
   EXPECT_CALL(mock_input_handler_,
-              DoTouchEventsBlockScrollAt(
+              EventListenerTypeForTouchStartAt(
                   testing::Property(&gfx::Point::x, testing::Gt(0))))
-      .WillOnce(testing::Return(true));
+      .WillOnce(testing::Return(
+          cc::EventListenerProperties::kBlockingAndMaybePassiveDueToFling));
   // Since the second touch point hits a touch-region, there should be no
   // hit-testing for the third touch point.
 
@@ -1990,8 +1989,8 @@ TEST_P(InputHandlerProxyTest, MultiTouchPointHitTestPositive) {
 }
 
 TEST_P(InputHandlerProxyTest, MultiTouchPointHitTestPassivePositive) {
-  // One of the touch points is on a touch-region. So the event should be sent
-  // to the main thread.
+  // One of the touch points is not on a touch-region. So the event should be
+  // sent to the impl thread.
   expected_disposition_ = InputHandlerProxy::DID_HANDLE_NON_BLOCKING;
   VERIFY_AND_RESET_MOCKS();
 
@@ -1999,8 +1998,8 @@ TEST_P(InputHandlerProxyTest, MultiTouchPointHitTestPassivePositive) {
       mock_input_handler_,
       GetEventListenerProperties(cc::EventListenerClass::kTouchStartOrMove))
       .WillRepeatedly(testing::Return(cc::EventListenerProperties::kPassive));
-  EXPECT_CALL(mock_input_handler_, DoTouchEventsBlockScrollAt(testing::_))
-      .WillRepeatedly(testing::Return(false));
+  EXPECT_CALL(mock_input_handler_, EventListenerTypeForTouchStartAt(testing::_))
+      .WillRepeatedly(testing::Return(cc::EventListenerProperties::kNone));
 
   WebTouchEvent touch;
   touch.type = WebInputEvent::TouchStart;
@@ -2029,8 +2028,8 @@ TEST_P(InputHandlerProxyTest, TouchStartPassiveAndTouchEndBlocking) {
       mock_input_handler_,
       GetEventListenerProperties(cc::EventListenerClass::kTouchEndOrCancel))
       .WillOnce(testing::Return(cc::EventListenerProperties::kBlocking));
-  EXPECT_CALL(mock_input_handler_, DoTouchEventsBlockScrollAt(testing::_))
-      .WillOnce(testing::Return(false));
+  EXPECT_CALL(mock_input_handler_, EventListenerTypeForTouchStartAt(testing::_))
+      .WillOnce(testing::Return(cc::EventListenerProperties::kNone));
 
   WebTouchEvent touch;
   touch.type = WebInputEvent::TouchStart;