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..ff2ae5c47075a06e18c32f3a25910eb63282f1a5 100644
--- a/content/renderer/gpu/input_event_filter.h
+++ b/content/renderer/gpu/input_event_filter.h
@@ -11,7 +11,8 @@
 #include "base/callback_forward.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
-#include "content/port/common/input_event_ack_state.h"
+#include "content/public/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,13 +27,14 @@
 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;
 
   // The |handler| is invoked on the thread associated with |target_loop| to
-  // handle input events matching the filtered routes.  In response, the
+  // handle input events matching the filtered routes. In response, the
   // handler should call either DidHandleInputEvent or DidNotHandleInputEvent.
   // These may be called asynchronously to the handler invocation, but they
   // must be called on the target thread.
@@ -49,13 +51,11 @@ class CONTENT_EXPORT InputEventFilter
                    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);
+  // InputHandlerManagerClient implementation.
+  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;