Fix WebView compositor input handling

content/browser/android/in_process/synchronous_compositor_impl.cc

Index: content/browser/android/in_process/synchronous_compositor_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc
index 4b70c9b455256ea72c1591beb3dc358d60782cc5..8fa47017afb71151426a3276f863516d3b3585ff 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -6,6 +6,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
+#include "content/browser/android/in_process/synchronous_input_event_filter.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
@@ -49,6 +50,17 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
         new SynchronousCompositorOutputSurface(routing_id));
     return output_surface.PassAs<cc::OutputSurface>();
   }
+
+  virtual InputHandlerManagerClient* GetInputHandlerManagerClient() OVERRIDE {
+    return synchronous_input_event_filter();
+  }
+
+  SynchronousInputEventFilter* synchronous_input_event_filter() {
+    return &synchronous_input_event_filter_;
+  }
+
+ private:
+  SynchronousInputEventFilter synchronous_input_event_filter_;
 };
 
 base::LazyInstance<SynchronousCompositorFactoryImpl>::Leaky g_factory =
@@ -139,6 +151,13 @@ void SynchronousCompositorImpl::SetContinuousInvalidate(bool enable) {
     compositor_client_->SetContinuousInvalidate(enable);
 }
 
+InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
+    const WebKit::WebInputEvent& input_event) {
+  DCHECK(CalledOnValidThread());
+  return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
+      routing_id_, input_event);
+}
+
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorImpl() must only be used on the UI thread.
 bool SynchronousCompositorImpl::CalledOnValidThread() const {