Fix WebView compositor input handling

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 38 matching lines @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/devtools/devtools_agent_filter.h"
 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
 #include "content/renderer/dom_storage/webstoragearea_impl.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
 #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"
 #include "content/renderer/media/media_stream_center.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/peer_connection_tracker.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "content/renderer/media/webrtc_logging_message_filter.h"
 #include "content/renderer/memory_benchmarking_extension.h"
@@ skipping 37 matching lines @@
 #else
 // TODO(port)
 #include "base/memory/scoped_handle.h"
 #include "content/common_child/np_channel_base.h"
 #endif
 
 #if defined(OS_POSIX)
 #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
 
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebNetworkStateNotifier;
 using WebKit::WebRuntimeFeatures;
 using WebKit::WebScriptController;
 using WebKit::WebSecurityPolicy;
@@ skipping 322 matching lines @@
   // Shutdown the file thread if it's running.
   if (file_thread_)
     file_thread_->Stop();
 
   if (compositor_output_surface_filter_) {
     RemoveFilter(compositor_output_surface_filter_.get());
     compositor_output_surface_filter_ = NULL;
   }
 
   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_)
     WebKit::shutdown();
 
   lazy_tls.Pointer()->Set(NULL);
 
   // TODO(port)
 #if defined(OS_WIN)
   // Clean up plugin channels before this thread goes away.
@@ skipping 274 matching lines @@
         GetContentClient()->renderer()->OverrideCompositorMessageLoop();
     if (override_loop) {
       compositor_message_loop_proxy_ = override_loop->message_loop_proxy();
     } else {
       compositor_thread_.reset(new base::Thread("Compositor"));
       compositor_thread_->Start();
       compositor_message_loop_proxy_ =
           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());
     }
   }
 
   scoped_refptr<base::MessageLoopProxy> output_surface_loop;
   if (enable)
     output_surface_loop = compositor_message_loop_proxy_;
   else
     output_surface_loop = base::MessageLoopProxy::current();
 
   compositor_output_surface_filter_ =
@@ skipping 548 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content