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

ui/events/blink/input_handler_proxy.cc

Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc
index 40d1415d9e9ec0a9493b194486da549f9aed5a8c..d1ead90330156d8c436eb1547d1afe63e97989a2 100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -835,12 +835,18 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleGestureFlingStart(
 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
     const blink::WebTouchEvent& touch_event) {
   EventDisposition result = DROP_EVENT;
+  bool maybe_passive_due_to_fling = false;
   for (size_t i = 0; i < touch_event.touchesLength; ++i) {
     if (touch_event.touches[i].state != WebTouchPoint::StatePressed)
       continue;
-    if (input_handler_->DoTouchEventsBlockScrollAt(
+    cc::EventListenerProperties event_result =
+        input_handler_->EventListenerTypeForTouchStartAt(
             gfx::Point(touch_event.touches[i].position.x,
-                       touch_event.touches[i].position.y))) {
+                       touch_event.touches[i].position.y));
+    if (event_result != cc::EventListenerProperties::kNone) {
+      maybe_passive_due_to_fling =
+          event_result ==
+          cc::EventListenerProperties::kBlockingAndMaybePassiveDueToFling;
       result = DID_NOT_HANDLE;
       break;
     }
@@ -892,7 +898,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
   }
 
   bool is_fling_on_impl = fling_curve_ && !fling_may_be_active_on_main_thread_;
-  if (result == DID_NOT_HANDLE && is_fling_on_impl)
+  if (is_fling_on_impl && maybe_passive_due_to_fling)
     result = DID_NOT_HANDLE_NON_BLOCKING_DUE_TO_FLING;
 
   return result;