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

content/browser/renderer_host/render_widget_host_view_mac.h

Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 5ea52b3ee74cf57f0afb5c30684e89c39cbd7497..1e9ae2ecfb6f4f67c207d16e3f6026b7c27743b7 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -25,6 +25,7 @@
 #include "cc/surfaces/surface_id.h"
 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
 #include "content/browser/renderer_host/input/mouse_wheel_rails_filter_mac.h"
+#include "content/browser/renderer_host/mouse_wheel_phase_handler.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/text_input_manager.h"
 #include "content/common/content_export.h"
@@ -412,6 +413,10 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // opaqueness changes.
   void UpdateBackgroundColorFromRenderer(SkColor color);
 
+  bool HasPendingWheelEndEventForTesting() {
+    return mouse_wheel_phase_handler_->HasPendingWheelEndEvent();
+  }
+
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
@@ -429,6 +434,8 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // determine if pinch gestures need to be thresholded.
   bool page_at_minimum_scale_;
 
+  std::unique_ptr<MouseWheelPhaseHandler> mouse_wheel_phase_handler_;

[tdresser, 2017/06/05 15:19:08]

Why a unique_ptr?

[sahel, 2017/06/05 19:05:43]

Done.

+
   NSWindow* pepper_fullscreen_window() const {
     return pepper_fullscreen_window_;
   }
@@ -486,12 +493,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // Get the focused view that should be used for retrieving the text selection.
   RenderWidgetHostViewBase* GetFocusedViewForTextSelection();
 
-  void ScheduleMouseWheelEndDispatching(blink::WebMouseWheelEvent wheel_event,
-                                        bool should_route_event);
-  void DispatchPendingWheelEndEvent();
-  void IgnorePendingWheelEndEvent();
-  bool HasPendingWheelEndEvent();
-
   // Returns the RenderWidgetHostDelegate corresponding to the currently focused
   // RenderWidgetHost. It is different from |render_widget_host_->delegate()|
   // when there are focused inner WebContentses on the page. Also, this method
@@ -574,8 +575,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   SkColor background_color_ = SK_ColorTRANSPARENT;
   SkColor last_frame_root_background_color_ = SK_ColorTRANSPARENT;
 
-  base::OneShotTimer mouse_wheel_end_dispatch_timer_;
-
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;