Move compositor thread input handling logic into content

content/renderer/gpu/input_handler_wrapper.h

Index: content/renderer/gpu/input_handler_wrapper.h
diff --git a/content/renderer/gpu/input_handler_wrapper.h b/content/renderer/gpu/input_handler_wrapper.h
new file mode 100644
index 0000000000000000000000000000000000000000..cae8339dc22b1bb07905b95c98c713eee6ee24d4
--- /dev/null
+++ b/content/renderer/gpu/input_handler_wrapper.h
@@ -0,0 +1,59 @@
+// 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_manager.h"
+#include "content/renderer/gpu/input_handler_proxy.h"
+#include "content/renderer/gpu/input_handler_proxy_client.h"
+
+namespace content {
+
+// This class lives on the compositor thread.
+class InputHandlerWrapper
+    : public InputHandlerProxyClient,
+      public base::RefCountedThreadSafe<InputHandlerWrapper> {

[piman, 2013/05/15 21:51:03]

Why the need for refcount? AFAICT the only reference is the input_handlers_ map
in InputHandlerManager.

+ 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_; }
+  InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; }
+
+  // InputHandlerProxyClient 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_;
+  InputHandlerProxy input_handler_proxy_;
+  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_