Refactor compositor event handling path to be callback-based

content/renderer/mus/compositor_mus_connection.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MUS_COMPOSITOR_MUS_CONNECTION_H_
 #define CONTENT_RENDERER_MUS_COMPOSITOR_MUS_CONNECTION_H_
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "content/common/content_export.h"
+#include "content/common/input/input_event_ack_state.h"
 #include "services/ui/public/cpp/input_event_handler.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/blink/scoped_web_input_event.h"
 #include "ui/events/gestures/motion_event_aura.h"
 
 namespace ui {
 struct DidOverscrollParams;
 }
 
 namespace content {
 
 class InputHandlerManager;
 
@@ skipping 29 matching lines @@
 
   void AttachSurfaceOnCompositorThread(
       std::unique_ptr<ui::WindowSurfaceBinding> surface_binding);
 
   void CreateWindowTreeClientOnCompositorThread(
       ui::mojom::WindowTreeClientRequest request);
 
   void OnConnectionLostOnMainThread();
 
   void OnWindowInputEventOnMainThread(
-      std::unique_ptr<blink::WebInputEvent> web_event,
+      ui::ScopedWebInputEvent web_event,
       const base::Callback<void(ui::mojom::EventResult)>& ack);
 
   void OnWindowInputEventAckOnMainThread(
       const base::Callback<void(ui::mojom::EventResult)>& ack,
       ui::mojom::EventResult result);
 
   std::unique_ptr<blink::WebInputEvent> Convert(const ui::Event& event);
 
   // WindowTreeClientDelegate implementation:
   void OnDidDestroyClient(ui::WindowTreeClient* client) override;
   void OnEmbed(ui::Window* root) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               ui::Window* target) override;
 
   // InputEventHandler implementation:
   void OnWindowInputEvent(
       ui::Window* window,
       const ui::Event& event,
       std::unique_ptr<base::Callback<void(ui::mojom::EventResult)>>*
           ack_callback) override;
+  void DidHandleWindowInputEventAndOverscroll(
+      std::unique_ptr<base::Callback<void(ui::mojom::EventResult)>>
+          ack_callback,
+      InputEventAckState ack_state,
+      ui::ScopedWebInputEvent web_event,
+      const ui::LatencyInfo& latency_info,
+      std::unique_ptr<ui::DidOverscrollParams>);

[Charlie Reis, 2016/09/09 20:57:57]

nit: Please name parameters.

[chongz, 2016/09/10 00:03:04]

Done.

 
   const int routing_id_;
   ui::Window* root_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   InputHandlerManager* const input_handler_manager_;
   std::unique_ptr<ui::WindowSurfaceBinding> window_surface_binding_;
 
   // Stores the current state of the active pointers targeting this object.
   ui::MotionEventAura pointer_state_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorMusConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MUS_COMPOSITOR_MUS_CONNECTION_H_