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

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1477 matching lines @@
 class LayerTreeHostTestCommit : public LayerTreeHostTest {
  public:
   LayerTreeHostTestCommit() {}
 
   void BeginTest() override {
     layer_tree_host()->SetViewportSize(gfx::Size(20, 20));
     layer_tree_host()->set_background_color(SK_ColorGRAY);
     layer_tree_host()->SetEventListenerProperties(
         EventListenerClass::kMouseWheel, EventListenerProperties::kPassive);
     layer_tree_host()->SetEventListenerProperties(
-        EventListenerClass::kTouch, EventListenerProperties::kBlocking);
+        EventListenerClass::kTouchStartOrMove,
+        EventListenerProperties::kBlocking);
+    layer_tree_host()->SetEventListenerProperties(
+        EventListenerClass::kTouchEndOrCancel,
+        EventListenerProperties::kBlockingAndPassive);
     layer_tree_host()->SetHaveScrollEventHandlers(true);
 
     PostSetNeedsCommitToMainThread();
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* impl) override {
     EXPECT_EQ(gfx::Size(20, 20), impl->DrawViewportSize());
     EXPECT_EQ(SK_ColorGRAY, impl->active_tree()->background_color());
     EXPECT_EQ(EventListenerProperties::kPassive,
               impl->active_tree()->event_listener_properties(
                   EventListenerClass::kMouseWheel));
     EXPECT_EQ(EventListenerProperties::kBlocking,
               impl->active_tree()->event_listener_properties(
-                  EventListenerClass::kTouch));
+                  EventListenerClass::kTouchStartOrMove));
+    EXPECT_EQ(EventListenerProperties::kBlockingAndPassive,
+              impl->active_tree()->event_listener_properties(
+                  EventListenerClass::kTouchEndOrCancel));
     EXPECT_TRUE(impl->active_tree()->have_scroll_event_handlers());
 
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestCommit);
 
@@ skipping 5095 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
 
 }  // namespace
 }  // namespace cc