Fix WebView compositor input handling

content/renderer/gpu/input_handler_manager.h

Index: content/renderer/gpu/input_handler_manager.h
diff --git a/content/renderer/gpu/input_handler_manager.h b/content/renderer/gpu/input_handler_manager.h
index 598e9448a3ec3e062952a3f393790130604bb91f..10d49dfcf29ed7fd9204fe5181ceb45854f053a8 100644
--- a/content/renderer/gpu/input_handler_manager.h
+++ b/content/renderer/gpu/input_handler_manager.h
@@ -7,10 +7,10 @@
 
 #include <map>
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "content/renderer/render_view_impl.h"
-#include "ipc/ipc_channel_proxy.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -26,26 +26,20 @@ class WebInputEvent;
 
 namespace content {
 
-class InputEventFilter;
 class InputHandlerWrapper;
+class InputHandlerManagerClient;
 
 // InputHandlerManager class manages InputHandlerProxy instances for
 // the WebViews in this renderer.
 class InputHandlerManager {
  public:
-  // |main_listener| refers to the central IPC message listener that lives on
-  // the main thread, where all incoming IPC messages are first handled.
-  // |message_loop_proxy| is the MessageLoopProxy of the compositor thread.
-  // The underlying MessageLoop must outlive this object.
+  // |message_loop_proxy| is the MessageLoopProxy of the compositor thread. Both
+  // the underlying MessageLoop and supplied |client| must outlive this object.
   InputHandlerManager(
-      IPC::Listener* main_listener,
-      const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy);
+      const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
+      InputHandlerManagerClient* client);
   ~InputHandlerManager();
 
-  // This MessageFilter should be added to allow input events to be redirected
-  // to the compositor's thread.
-  IPC::ChannelProxy::MessageFilter* GetMessageFilter() const;
-
   // Callable from the main thread only.
   void AddInputHandler(
       int routing_id,
@@ -57,10 +51,7 @@ class InputHandlerManager {
 
   // Called from the compositor's thread.
   InputEventAckState HandleInputEvent(int routing_id,
-                                      const WebKit::WebInputEvent* input_event);
-
-  // Called from the compositor's thread.
-  InputEventFilter* filter() { return filter_.get(); }
+                                      const WebKit::WebInputEvent& input_event);
 
  private:
   // Called from the compositor's thread.
@@ -75,7 +66,7 @@ class InputHandlerManager {
   InputHandlerMap input_handlers_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
-  scoped_refptr<InputEventFilter> filter_;
+  InputHandlerManagerClient* client_;
 };
 
 }  // namespace content