Refactor compositor event handling path to be callback-based

content/renderer/input/input_handler_manager.h

Index: content/renderer/input/input_handler_manager.h
diff --git a/content/renderer/input/input_handler_manager.h b/content/renderer/input/input_handler_manager.h
index f9313666d731f6fbba8af2a00e3cb0cc942bef94..3c7c26c64817aeae185d9a1fca1ee2a33ff48a54 100644
--- a/content/renderer/input/input_handler_manager.h
+++ b/content/renderer/input/input_handler_manager.h
@@ -11,6 +11,7 @@
 #include "content/common/content_export.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/renderer/render_view_impl.h"
+#include "ui/events/blink/input_handler_proxy.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -79,11 +80,16 @@ class CONTENT_EXPORT InputHandlerManager {
   // Callback only from the compositor's thread.
   void RemoveInputHandler(int routing_id);
 
+  using InputEventAckStateCallback =
+      base::Callback<void(InputEventAckState,
+                          ui::ScopedWebInputEvent,
+                          const ui::LatencyInfo&,
+                          std::unique_ptr<ui::DidOverscrollParams>)>;
   // Called from the compositor's thread.
-  virtual InputEventAckState HandleInputEvent(
-      int routing_id,
-      const blink::WebInputEvent* input_event,
-      ui::LatencyInfo* latency_info);
+  virtual void HandleInputEvent(int routing_id,
+                                ui::ScopedWebInputEvent input_event,
+                                const ui::LatencyInfo& latency_info,
+                                const InputEventAckStateCallback& callback);
 
   // Called from the compositor's thread.
   void DidOverscroll(int routing_id, const ui::DidOverscrollParams& params);
@@ -120,6 +126,14 @@ class CONTENT_EXPORT InputHandlerManager {
       const blink::WebGestureEvent& gesture_event,
       const cc::InputHandlerScrollResult& scroll_result);
 
+  using EventDisposition = ui::InputHandlerProxy::EventDisposition;

[tdresser, 2016/09/01 16:58:45]

I'm not sure it's worth this "using" for two uses.

[chongz, 2016/09/01 20:13:13]

Removed.

+  void DidHandleInputEventAndOverscroll(
+      const InputEventAckStateCallback& callback,
+      EventDisposition event_disposition,
+      ui::ScopedWebInputEvent input_event,
+      const ui::LatencyInfo& latency_info,
+      std::unique_ptr<ui::DidOverscrollParams> overscroll_params);
+
   typedef base::ScopedPtrHashMap<int,  // routing_id
                                  std::unique_ptr<InputHandlerWrapper>>
       InputHandlerMap;
@@ -130,6 +144,8 @@ class CONTENT_EXPORT InputHandlerManager {
   // May be null.
   SynchronousInputHandlerProxyClient* const synchronous_handler_proxy_client_;
   blink::scheduler::RendererScheduler* const renderer_scheduler_;  // Not owned.
+
+  base::WeakPtrFactory<InputHandlerManager> weak_ptr_factory_;
 };
 
 }  // namespace content