Fix WebView compositor input handling

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 4f16452d75f8a854c461f1ef2af7a40aa1a41ad0..c4e2b009f12ce05f914600f75d3ed1a5f70b46a7 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -56,6 +56,7 @@
 #include "content/renderer/gpu/compositor_output_surface.h"
 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
 #include "content/renderer/gpu/input_handler_manager.h"
+#include "content/renderer/gpu/input_event_filter.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
@@ -113,6 +114,10 @@
 #include "ipc/ipc_channel_posix.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "content/renderer/android/synchronous_input_event_filter.h"
+#endif
+
 #if defined(ENABLE_WEBRTC)
 #include "third_party/webrtc/system_wrappers/interface/event_tracer.h"
 #endif
@@ -455,9 +460,11 @@ void RenderThreadImpl::Shutdown() {
   }
 
   compositor_thread_.reset();
-  if (input_handler_manager_) {
-    RemoveFilter(input_handler_manager_->GetMessageFilter());
-    input_handler_manager_.reset();
+  input_handler_manager_.reset();
+  override_input_handler_manager_client_.reset();
+  if (input_event_filter_) {
+    RemoveFilter(input_event_filter_.get());
+    input_event_filter_ = NULL;
   }
 
   if (webkit_platform_support_)
@@ -752,10 +759,29 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
           compositor_thread_->message_loop_proxy();
     }
 
-    if (GetContentClient()->renderer()->ShouldCreateCompositorInputHandler()) {
-      input_handler_manager_.reset(
-          new InputHandlerManager(this, compositor_message_loop_proxy_));
-      AddFilter(input_handler_manager_->GetMessageFilter());
+    input_handler_manager_.reset(
+        new InputHandlerManager(compositor_message_loop_proxy_));
+
+    base::Callback<void(int, const WebKit::WebInputEvent*)> handler(
+        base::Bind(&InputHandlerManager::HandleInputEvent,
+                   base::Unretained(input_handler_manager_.get())));
+
+#if defined(OS_ANDROID)
+    if (command_line.HasSwitch(
+            switches::kEnableSynchronousRendererCompositor)) {
+      scoped_ptr<SynchronousInputEventFilter> input_event_filter(
+          new SynchronousInputEventFilter(handler));
+      input_handler_manager_->BindToClient(input_event_filter.get());
+      GetContentClient()->renderer()->DidCreateSynchronousInputEventHandler(
+          input_event_filter.get());
+      override_input_handler_manager_client_ =
+          input_event_filter.PassAs<InputHandlerManagerClient>();
+    }
+#endif
+    if (!override_input_handler_manager_client_) {
+      input_event_filter_ =
+          new InputEventFilter(this, compositor_message_loop_proxy_, handler);
+      input_handler_manager_->BindToClient(input_event_filter_.get());
     }
   }