Fix WebView compositor input handling

content/renderer/gpu/input_event_filter.h

Index: content/renderer/gpu/input_event_filter.h
diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h
index 9e9481936f2d801c444b9e28c63b6ae68df28973..2b33d22bfc6d98e4a9113d6bc7bab0d34ea06c4b 100644
--- a/content/renderer/gpu/input_event_filter.h
+++ b/content/renderer/gpu/input_event_filter.h
@@ -12,6 +12,7 @@
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/port/common/input_event_ack_state.h"
+#include "content/renderer/gpu/input_handler_manager_client.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
@@ -26,7 +27,8 @@
 namespace content {
 
 class CONTENT_EXPORT InputEventFilter
-    : public IPC::ChannelProxy::MessageFilter {
+    : public InputHandlerManagerClient,
+      public IPC::ChannelProxy::MessageFilter {
  public:
   typedef base::Callback<void(int /*routing_id*/,
                               const WebKit::WebInputEvent*)> Handler;
@@ -46,16 +48,14 @@ class CONTENT_EXPORT InputEventFilter
   // main thread.
   //
   InputEventFilter(IPC::Listener* main_listener,
-                   const scoped_refptr<base::MessageLoopProxy>& target_loop,
-                   const Handler& handler);
-
-  // Define the message routes to be filtered.
-  void AddRoute(int routing_id);
-  void RemoveRoute(int routing_id);
-
-  // Called on the target thread by the Handler.
-  void DidHandleInputEvent();
-  void DidNotHandleInputEvent(bool send_to_widget);
+                   const scoped_refptr<base::MessageLoopProxy>& target_loop);
+
+  // InputHandlerManagerClient implementation.
+  virtual void SetHandler(const Handler& handler) OVERRIDE;
+  virtual void DidAddInputHandler(int routing_id) OVERRIDE;
+  virtual void DidRemoveInputHandler(int routing_id) OVERRIDE;
+  virtual void DidHandleInputEvent() OVERRIDE;
+  virtual void DidNotHandleInputEvent(bool send_to_widget) OVERRIDE;
 
   // IPC::ChannelProxy::MessageFilter methods:
   virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;