Move compositor thread input handling logic into content

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6f0a2191439139b2f16d255eb0927b1d6fcbbe7d..53528a40feacf9e59193e22501d23c85997b9f6f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -129,6 +129,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h"

[danakj, 2013/05/01 19:20:43]

What's this for?

 #include "third_party/WebKit/Source/Platform/chromium/public/WebMessagePortChannel.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
@@ -2600,9 +2601,12 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
 #if !defined(OS_MACOSX)  // many events are unhandled - http://crbug.com/138003
   InputHandlerManager* input_handler_manager =
       RenderThreadImpl::current()->input_handler_manager();
-  if (input_handler_manager)
-    input_handler_manager->AddInputHandler(
-        routing_id_, input_handler_identifier, AsWeakPtr());
+  if (input_handler_manager) {
+     input_handler_manager->AddInputHandler(
+        routing_id_,
+        compositor_->GetInputHandler(),
+        AsWeakPtr());
+  }
 #endif
 
   RenderWidget::didActivateCompositor(input_handler_identifier);