Remove RenderViewImpl::didActivateCompositor

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 bea25aa22d9138c05f0bafac7c0123fe1fdb3237..7cc53a8ea3183d2d44ccfdc9cb496784df5c6248 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -729,6 +729,17 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
     RenderThreadImpl::current()->WidgetCreated();
     if (is_hidden_)
       RenderThreadImpl::current()->WidgetHidden();
+
+#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_,
+         compositor_->GetInputHandler(),

[piman, 2014/05/22 00:12:24]

Do we have compositor_ this early? I thought it was created in CompleteInit. I
may be wrong though.

[enne (OOO), 2014/05/27 20:40:32]

It's started in CompleteInit, but created in initializeLayerTreeView.  I think
you're right though that maybe Initialize() could happen prior to
initializeLayerTreeView and it seems safer to move this code there, where it's
100% sure that compositor_ now exists.

+         AsWeakPtr());
+    }
+#endif
   }
 
   // If this is a popup, we must wait for the CreatingNew_ACK message before
@@ -1919,21 +1930,6 @@ bool RenderViewImpl::isPointerLocked() {
       webwidget_mouse_lock_target_.get());
 }
 
-void RenderViewImpl::didActivateCompositor() {
-#if !defined(OS_MACOSX)  // many events are unhandled - http://crbug.com/138003
-  RenderThreadImpl* render_thread = RenderThreadImpl::current();
-  // render_thread may be NULL in tests.
-  InputHandlerManager* input_handler_manager =
-      render_thread ? render_thread->input_handler_manager() : NULL;
-  if (input_handler_manager) {
-     input_handler_manager->AddInputHandler(
-        routing_id_,
-        compositor_->GetInputHandler(),
-        AsWeakPtr());
-  }
-#endif
-}
-
 void RenderViewImpl::didHandleGestureEvent(
     const WebGestureEvent& event,
     bool event_cancelled) {