Move compositor thread input handling logic into content

content/renderer/gpu/input_handler_wrapper.h

+// Copyright (c) 2013 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_GPU_INPUT_HANDLER_WRAPPER_H_
+#define CONTENT_RENDERER_GPU_INPUT_HANDLER_WRAPPER_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "content/renderer/gpu/input_handler_client_impl.h"
+#include "content/renderer/gpu/input_handler_client_impl_client.h"
+#include "content/renderer/gpu/input_handler_manager.h"
+
+namespace content {
+
+class InputHandlerWrapper

[danakj, 2013/05/01 19:20:43]

Hmm or is this the InputHandlerProxy. Or the InputHandlerClientProxy?

I was kinda wondering offhand if the InputHandlerClientImplClient could go away,
and it could just refer to InputHandlerWrapper directly, and the tests could
subclass and MOCK out the InputHandlerWrapper, since it's all on the same side
of the fence?

That would make this the InputHandlerProxyClient?

<_<

+    : public InputHandlerClientImplClient,
+      public base::RefCountedThreadSafe<InputHandlerWrapper> {
+ public:
+  InputHandlerWrapper(InputHandlerManager* input_handler_manager,
+                      int routing_id,
+                      const scoped_refptr<base::MessageLoopProxy>& main_loop,
+                      const base::WeakPtr<cc::InputHandler>& input_handler,
+                      const base::WeakPtr<RenderViewImpl>& render_view_impl);
+
+  int routing_id() const { return routing_id_; }
+  InputHandlerClientImpl* input_handler() const { return input_handler_.get(); }
+
+  // InputHandlerClientImplClient implementation.
+  virtual void willShutdown() OVERRIDE;
+  virtual void didHandleInputEvent() OVERRIDE;
+  virtual void didNotHandleInputEvent(bool send_to_widget) OVERRIDE;
+  virtual void transferActiveWheelFlingAnimation(
+      const WebKit::WebActiveWheelFlingParameters& params) OVERRIDE;
+  virtual WebKit::WebGestureCurve* createFlingAnimationCurve(
+      int deviceSource,
+      const WebKit::WebFloatPoint& velocity,
+      const WebKit::WebSize& cumulativeScroll) OVERRIDE;
+
+ private:
+  friend class base::RefCountedThreadSafe<InputHandlerWrapper>;
+
+  virtual ~InputHandlerWrapper();
+
+  InputHandlerManager* input_handler_manager_;
+  int routing_id_;
+  scoped_ptr<InputHandlerClientImpl> input_handler_;
+  scoped_refptr<base::MessageLoopProxy> main_loop_;
+
+  // Can only be accessed on the main thread.
+  base::WeakPtr<RenderViewImpl> render_view_impl_;
+
+  DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_GPU_INPUT_HANDLER_WRAPPER_H_