Animated scroll shouldn't consume unhandled scrolls for OOPIFs.

content/browser/renderer_host/render_widget_host_input_event_router.cc

 // Copyright 2015 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 "content/browser/renderer_host/render_widget_host_input_event_router.h"
 
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "cc/quads/surface_draw_quad.h"
@@ skipping 709 matching lines @@
     // need to wrap the diverted pinch events in a GestureScrollBegin/End.
     // TODO(wjmaclean,kenrb,tdresser): When scroll latching lands, we can
     // revisit how this code should work.
     // https://crbug.com/526463
     auto* rwhi =
         static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost());
     // If the root view is the current gesture target, then we explicitly don't
     // send a GestureScrollBegin, as by the time we see GesturePinchBegin there
     // should have been one.
     if (root_view != touchscreen_gesture_target_.target &&
-        !rwhi->is_in_touchscreen_gesture_scroll()) {
+        !rwhi->is_in_gesture_scroll(
+            blink::WebGestureDevice::kWebGestureDeviceTouchscreen)) {
       gesture_pinch_did_send_scroll_begin_ = true;
       SendGestureScrollBegin(root_view, *event);
     }
   }
 
   if (in_touchscreen_gesture_pinch_) {
     root_view->ProcessGestureEvent(*event, latency);
     if (event->GetType() == blink::WebInputEvent::kGesturePinchEnd) {
       in_touchscreen_gesture_pinch_ = false;
       // If the root view wasn't already receiving the gesture stream, then we
       // need to wrap the diverted pinch events in a GestureScrollBegin/End.
       auto* rwhi =
           static_cast<RenderWidgetHostImpl*>(root_view->GetRenderWidgetHost());
       if (root_view != touchscreen_gesture_target_.target &&
           gesture_pinch_did_send_scroll_begin_ &&
-          rwhi->is_in_touchscreen_gesture_scroll()) {
+          rwhi->is_in_gesture_scroll(
+              blink::WebGestureDevice::kWebGestureDeviceTouchscreen)) {
         SendGestureScrollEnd(root_view, *event);
       }
       gesture_pinch_did_send_scroll_begin_ = false;
     }
     return;
   }
 
   // We use GestureTapDown to detect the start of a gesture sequence since there
   // is no WebGestureEvent equivalent for ET_GESTURE_BEGIN. Note that this
   // means the GestureFlingCancel that always comes between ET_GESTURE_BEGIN and
@@ skipping 68 matching lines @@
   if (!touchpad_gesture_target_.target)
     return;
 
   // TODO(mohsen): Add tests to check event location.
   event->x += touchpad_gesture_target_.delta.x();
   event->y += touchpad_gesture_target_.delta.y();
   touchpad_gesture_target_.target->ProcessGestureEvent(*event, latency);
 }
 
 }  // namespace content