Collapse Scroll[Begin|Update|End] into a common handler.

Unify handling of gesture scroll events. Dismiss any outstanding
page popup on these events.

BUG=1097816

Change-Id: I39fd4d4dd10ada132d9d440c1b9d72c81389f60a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551247
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830621}

third_party/blink/renderer/core/frame/web_frame_widget_base.cc

@@ -821,6 +821,21 @@ WebInputEventResult WebFrameWidgetBase::HandleGestureEvent(
       event_result = WebInputEventResult::kHandledSystem;
       DidHandleGestureEvent(event);
       return event_result;
+    case WebInputEvent::Type::kGestureScrollBegin:
+    case WebInputEvent::Type::kGestureScrollEnd:
+    case WebInputEvent::Type::kGestureScrollUpdate:
+      // If we are getting any scroll toss close any page popup that is open.
+      web_view->CancelPagePopup();
+
+      // Scrolling-related gesture events invoke EventHandler recursively for
+      // each frame down the chain, doing a single-frame hit-test per frame.
+      // This matches handleWheelEvent.  Perhaps we could simplify things by
+      // rewriting scroll handling to work inner frame out, and then unify with
+      // other gesture events.
+      event_result =
+          frame->GetEventHandler().HandleGestureScrollEvent(scaled_event);
+      DidHandleGestureEvent(event);
+      return event_result;
     default:
       break;
   }

third_party/blink/renderer/core/frame/web_frame_widget_impl.cc

@@ -215,9 +215,6 @@ WebInputEventResult WebFrameWidgetImpl::HandleGestureEventScaled(
     const WebGestureEvent& scaled_event) {
   base::Optional<ContextMenuAllowedScope> maybe_context_menu_scope;
   switch (scaled_event.GetType()) {
-    case WebInputEvent::Type::kGestureScrollBegin:
-    case WebInputEvent::Type::kGestureScrollEnd:
-    case WebInputEvent::Type::kGestureScrollUpdate:
     case WebInputEvent::Type::kGestureTap:
     case WebInputEvent::Type::kGestureTapUnconfirmed:
     case WebInputEvent::Type::kGestureTapDown:

third_party/blink/renderer/core/frame/web_view_frame_widget.cc

@@ -78,25 +78,6 @@ WebInputEventResult WebViewFrameWidget::HandleGestureEventScaled(
 
   WebInputEventResult event_result = WebInputEventResult::kNotHandled;
 
-  // Special handling for double tap and scroll events as we don't want to
-  // hit test for them.
-  switch (scaled_event.GetType()) {
-    case WebInputEvent::Type::kGestureScrollBegin:
-    case WebInputEvent::Type::kGestureScrollEnd:
-    case WebInputEvent::Type::kGestureScrollUpdate:
-      // Scrolling-related gesture events invoke EventHandler recursively for
-      // each frame down the chain, doing a single-frame hit-test per frame.
-      // This matches handleWheelEvent.  Perhaps we could simplify things by
-      // rewriting scroll handling to work inner frame out, and then unify with
-      // other gesture events.
-      return web_view->MainFrameImpl()
-          ->GetFrame()
-          ->GetEventHandler()
-          .HandleGestureScrollEvent(scaled_event);
-    default:
-      break;
-  }
-
   // Hit test across all frames and do touch adjustment as necessary for the
   // event type.
   GestureEventWithHitTestResults targeted_event =