Non passive touch end or touch cancel listeners should not block scroll.

third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 110 matching lines @@
     // Make sure the scrolling coordinator is active.
     FrameView* frameView = frame()->view();
     Page* page = frame()->page();
     ASSERT_TRUE(page->scrollingCoordinator());
     ASSERT_TRUE(page->scrollingCoordinator()->coordinatesScrollingForFrameView(frameView));
 
     // Fast scrolling should be enabled by default.
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_TRUE(rootScrollLayer->scrollable());
     ASSERT_FALSE(rootScrollLayer->shouldScrollOnMainThread());
-    ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));
+    ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));
     ASSERT_EQ(WebEventListenerProperties::Nothing, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::MouseWheel));
 }
 
 TEST_F(ScrollingCoordinatorTest, fastScrollingCanBeDisabledWithSetting)
 {
     navigateTo("about:blank");
     webViewImpl()->settings()->setThreadedScrollingEnabled(false);
     forceFullCompositingUpdate();
 
     // Make sure the scrolling coordinator is active.
@@ skipping 145 matching lines @@
         ASSERT_TRUE(constraint.isFixedToRightEdge && constraint.isFixedToBottomEdge);
     }
 }
 
 TEST_F(ScrollingCoordinatorTest, touchEventHandler)
 {
     registerMockedHttpURLLoad("touch-event-handler.html");
     navigateTo(m_baseURL + "touch-event-handler.html");
     forceFullCompositingUpdate();
 
-    ASSERT_EQ(WebEventListenerProperties::Blocking, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));
+    ASSERT_EQ(WebEventListenerProperties::Blocking, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));
 }
 
 TEST_F(ScrollingCoordinatorTest, touchEventHandlerPassive)
 {
     registerMockedHttpURLLoad("touch-event-handler-passive.html");
     navigateTo(m_baseURL + "touch-event-handler-passive.html");
     forceFullCompositingUpdate();
 
-    ASSERT_EQ(WebEventListenerProperties::Passive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));
+    ASSERT_EQ(WebEventListenerProperties::Passive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));
 }
 
 TEST_F(ScrollingCoordinatorTest, touchEventHandlerBoth)
 {
     registerMockedHttpURLLoad("touch-event-handler-both.html");
     navigateTo(m_baseURL + "touch-event-handler-both.html");
     forceFullCompositingUpdate();
 
-    ASSERT_EQ(WebEventListenerProperties::BlockingAndPassive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::Touch));
+    ASSERT_EQ(WebEventListenerProperties::BlockingAndPassive, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::TouchStartOrMove));
 }
 
 TEST_F(ScrollingCoordinatorTest, wheelEventHandler)
 {
     registerMockedHttpURLLoad("wheel-event-handler.html");
     navigateTo(m_baseURL + "wheel-event-handler.html");
     forceFullCompositingUpdate();
 
     ASSERT_EQ(WebEventListenerProperties::Blocking, webLayerTreeView()->eventListenerProperties(WebEventListenerClass::MouseWheel));
 }
@@ skipping 298 matching lines @@
     EXPECT_FALSE(scrollLayer->shouldScrollOnMainThread());
 
     fixedPos->setInlineStyleProperty(CSSPropertyTransform, CSSValueNone);
     forceFullCompositingUpdate();
 
     EXPECT_FALSE(static_cast<LayoutBoxModelObject*>(fixedPos->layoutObject())->layer()->hasCompositedLayerMapping());
     EXPECT_TRUE(scrollLayer->shouldScrollOnMainThread());
 }
 
 } // namespace blink