Remove RenderViewImpl::didActivateCompositor

content/renderer/render_view_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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 711 matching lines @@
 #endif
 
   RenderThread::Get()->AddRoute(routing_id_, this);
   // Take a reference on behalf of the RenderThread.  This will be balanced
   // when we receive ViewMsg_ClosePage.
   AddRef();
   if (RenderThreadImpl::current()) {
     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
   // completing initialization.  Otherwise, we can finish it now.
   if (opener_id_ == MSG_ROUTING_NONE) {
     did_show_ = true;
     CompleteInit();
   }
 
   g_view_map.Get().insert(std::make_pair(webview(), this));
@@ skipping 1170 matching lines @@
 
 void RenderViewImpl::requestPointerUnlock() {
   mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
 }
 
 bool RenderViewImpl::isPointerLocked() {
   return mouse_lock_dispatcher_->IsMouseLockedTo(
       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) {
   RenderWidget::didHandleGestureEvent(event, event_cancelled);
 
   if (event.type != blink::WebGestureEvent::GestureTap)
     return;
 
   blink::WebTextInputType text_input_type =
       GetWebView()->textInputInfo().type;
@@ skipping 2140 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content