Move content/renderer input handling for web input events to ui

content/renderer/android/synchronous_compositor_proxy.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_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 
 #include "base/macros.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/renderer/android/synchronous_compositor_external_begin_frame_source.h"
 #include "content/renderer/android/synchronous_compositor_output_surface.h"
 #include "content/renderer/input/input_handler_manager_client.h"
-#include "content/renderer/input/synchronous_input_handler_proxy.h"
+#include "ui/events/blink/synchronous_input_handler_proxy.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size_f.h"
 
 namespace IPC {
 class Message;
 class Sender;
 }  // namespace IPC
 
 namespace blink {
 class WebInputEvent;
 }  // namespace blink
 
 namespace cc {
 class CompositorFrame;
 }  // namespace cc
 
+namespace ui {

[boliu, 2015/11/16 19:12:12]

not needed

[Khushal, 2015/11/16 21:12:49]

Done.

+class SynchronousInputHandler;
+class SynchronousInputHandlerProxy;
+}  // namespace ui
+
 namespace content {
 
 class SynchronousCompositorOutputSurface;
 struct SyncCompositorCommonBrowserParams;
 struct SyncCompositorCommonRendererParams;
 struct SyncCompositorDemandDrawHwParams;
 
 class SynchronousCompositorProxy
-    : public SynchronousInputHandler,
+    : public ui::SynchronousInputHandler,
       public SynchronousCompositorExternalBeginFrameSourceClient,
       public SynchronousCompositorOutputSurfaceClient {
  public:
   SynchronousCompositorProxy(
       int routing_id,
       IPC::Sender* sender,
       SynchronousCompositorOutputSurface* output_surface,
       SynchronousCompositorExternalBeginFrameSource* begin_frame_source,
-      SynchronousInputHandlerProxy* input_handler_proxy,
+      ui::SynchronousInputHandlerProxy* input_handler_proxy,
       InputHandlerManagerClient::Handler* handler);
   ~SynchronousCompositorProxy() override;
 
-  // SynchronousInputHandler overrides.
+  // ui::SynchronousInputHandler overrides.
   void SetNeedsSynchronousAnimateInput() override;
   void UpdateRootLayerState(const gfx::ScrollOffset& total_scroll_offset,
                             const gfx::ScrollOffset& max_scroll_offset,
                             const gfx::SizeF& scrollable_size,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
 
   // SynchronousCompositorExternalBeginFrameSourceClient overrides.
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
@@ skipping 29 matching lines @@
                     cc::CompositorFrame* frame);
 
   void DidActivatePendingTree();
   void DeliverMessages();
   void SendAsyncRendererStateIfNeeded();
 
   const int routing_id_;
   IPC::Sender* const sender_;
   SynchronousCompositorOutputSurface* const output_surface_;
   SynchronousCompositorExternalBeginFrameSource* const begin_frame_source_;
-  SynchronousInputHandlerProxy* const input_handler_proxy_;
+  ui::SynchronousInputHandlerProxy* const input_handler_proxy_;
   InputHandlerManagerClient::Handler* const input_handler_;
   bool inside_receive_;
 
   // From browser.
   size_t bytes_limit_;
 
   uint32_t version_;
   gfx::ScrollOffset total_scroll_offset_;  // Modified by both.
   gfx::ScrollOffset max_scroll_offset_;
   gfx::SizeF scrollable_size_;
   float page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
   bool need_animate_scroll_;
   bool need_invalidate_;
   bool need_begin_frame_;
   bool did_activate_pending_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_