Adding phase info to wheel events migrated to wheel phase handler class.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 446 matching lines @@
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this),
       stylus_text_selector_(this),
       using_browser_compositor_(CompositorImpl::IsInitialized()),
       synchronous_compositor_client_(nullptr),
       frame_evictor_(new viz::FrameEvictor(this)),
       observing_root_window_(false),
       prev_top_shown_pix_(0.f),
       prev_bottom_shown_pix_(0.f),
+      mouse_wheel_phase_handler_(widget_host, this),
       weak_ptr_factory_(this) {
   // Set the layer which will hold the content layer for this view. The content
   // layer is managed by the DelegatedFrameHost.
   view_.SetLayer(cc::Layer::Create());
   view_.SetLayout(ui::ViewAndroid::LayoutParams::MatchParent());
 
   if (using_browser_compositor_) {
     cc::FrameSinkId frame_sink_id =
         host_->AllocateFrameSinkId(false /* is_guest_view_hack */);
     delegated_frame_host_.reset(new ui::DelegatedFrameHostAndroid(
@@ skipping 1336 matching lines @@
   }
 }
 
 void RenderWidgetHostViewAndroid::SendMouseWheelEvent(
     const blink::WebMouseWheelEvent& event) {
   if (!host_ || !host_->delegate())
     return;
 
   ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
   latency_info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
-  if (SiteIsolationPolicy::AreCrossProcessFramesPossible() &&
-      host_->delegate()->GetInputEventRouter()) {
-    blink::WebMouseWheelEvent wheel_event(event);
+  blink::WebMouseWheelEvent wheel_event(event);
+  bool should_route_event =
+      SiteIsolationPolicy::AreCrossProcessFramesPossible() &&
+      host_->delegate()->GetInputEventRouter();
+  if (wheel_scroll_latching_enabled()) {
+    mouse_wheel_phase_handler_.AddPhaseIfNeededAndScheduleEndEvent(
+        wheel_event, should_route_event);
+  }
+  if (should_route_event) {
     host_->delegate()->GetInputEventRouter()->RouteMouseWheelEvent(
         this, &wheel_event, latency_info);
   } else {
-    host_->ForwardWheelEventWithLatencyInfo(event, latency_info);
+    host_->ForwardWheelEventWithLatencyInfo(wheel_event, latency_info);
   }
 }
 
 void RenderWidgetHostViewAndroid::SendGestureEvent(
     const blink::WebGestureEvent& event) {
   // Sending a gesture that may trigger overscroll should resume the effect.
   if (overscroll_controller_)
     overscroll_controller_->Enable();
 
   if (!host_ || !host_->delegate())
     return;
 
   ui::LatencyInfo latency_info =
       ui::WebInputEventTraits::CreateLatencyInfoForWebGestureEvent(event);
-  if (SiteIsolationPolicy::AreCrossProcessFramesPossible() &&
-      host_->delegate()->GetInputEventRouter()) {
+  if (wheel_scroll_latching_enabled()) {
+    if (event.source_device ==
+        blink::WebGestureDevice::kWebGestureDeviceTouchscreen) {
+      if (event.GetType() == blink::WebInputEvent::kGestureScrollBegin) {
+        // If there is a current scroll going on and a new scroll that isn't
+        // wheel based, send a synthetic wheel event with kPhaseEnded to cancel
+        // the current scroll.
+        mouse_wheel_phase_handler_.DispatchPendingWheelEndEvent();
+      } else if (event.GetType() == blink::WebInputEvent::kGestureScrollEnd) {
+        // Make sure that the next wheel event will have phase = |kPhaseBegan|.
+        // This is for maintaining the correct phase info when some of the wheel
+        // events get ignored while a touchscreen scroll is going on.
+        mouse_wheel_phase_handler_.IgnorePendingWheelEndEvent();
+      }
+
+    } else if (event.GetType() == blink::WebInputEvent::kGestureFlingStart &&
+               event.source_device ==
+                   blink::WebGestureDevice::kWebGestureDeviceTouchpad) {
+      // Ignore the pending wheel end event to avoid sending a wheel event with
+      // kPhaseEnded before a GFS.
+      mouse_wheel_phase_handler_.IgnorePendingWheelEndEvent();
+    }
+  }
+  bool should_route_event =
+      SiteIsolationPolicy::AreCrossProcessFramesPossible() &&
+      host_->delegate()->GetInputEventRouter();
+  if (should_route_event) {
     blink::WebGestureEvent gesture_event(event);
     host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
         this, &gesture_event, latency_info);
   } else {
     host_->ForwardGestureEventWithLatencyInfo(event, latency_info);
   }
 }
 
 void RenderWidgetHostViewAndroid::ResolveTapDisambiguation(
     double timestamp_seconds,
@@ skipping 386 matching lines @@
 
   ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor, view_.GetDipScale());
 }
 
 }  // namespace content