Start using RenderFrameProxyHost objects.

content/browser/frame_host/render_frame_proxy_host.cc

 // Copyright 2014 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/browser/frame_host/render_frame_proxy_host.h"
 
 #include "content/browser/frame_host/cross_process_frame_connector.h"
+#include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_messages.h"
 #include "ipc/ipc_message.h"
 
 namespace content {
 
 RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
                                            FrameTreeNode* frame_tree_node)
     : routing_id_(site_instance->GetProcess()->GetNextRoutingID()),
       site_instance_(site_instance),
       frame_tree_node_(frame_tree_node) {
   GetProcess()->AddRoute(routing_id_, this);
 
   if (!frame_tree_node_->IsMainFrame() &&
       frame_tree_node_->parent()
               ->render_manager()
               ->current_frame_host()
               ->GetSiteInstance() == site_instance) {
     // The RenderFrameHost navigating cross-process is destroyed and a proxy for
     // it is created in the parent's process. CrossProcessFrameConnector
     // initialization only needs to happen on an initial cross-process
     // navigation, when the RenderFrameHost leaves the same process as its
     // parent. The same CrossProcessFrameConnector is used for subsequent cross-
     // process navigations, but it will be destroyed if the frame is
     // navigated back to the same SiteInstance as its parent.
     cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this));
   }
+
+  RenderFrameHostManager* manager = NULL;
+  if (frame_tree_node_->parent()) {
+    manager = frame_tree_node_->parent()->render_manager();
+  }

[ncarter (slow), 2014/07/21 20:31:57]

These lines seem to have no effect.

[kenrb, 2014/07/24 17:53:53]

Removed.

 }
 
 RenderFrameProxyHost::~RenderFrameProxyHost() {
   if (GetProcess()->HasConnection())
     Send(new FrameMsg_DeleteProxy(routing_id_));
 
   GetProcess()->RemoveRoute(routing_id_);
 }
 
 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
@@ skipping 26 matching lines @@
     return true;
 
   // TODO(nasko): This can be removed once we don't have a swapped out state on
   // RenderFrameHosts. See https://crbug.com/357747.
   if (render_frame_host_.get())
     return render_frame_host_->OnMessageReceived(msg);
 
   return false;
 }
 
+bool RenderFrameProxyHost::InitRenderFrameProxy() {
+  // The process may (if we're sharing a process with another host that already
+  // initialized it) or may not (we have our own process or the old process
+  // crashed) have been initialized. Calling Init multiple times will be
+  // ignored, so this is safe.
+  if (!site_instance_->GetProcess()->Init())
+    return false;
+
+  DCHECK(GetProcess()->HasConnection());
+  DCHECK(GetProcess()->GetBrowserContext());

[ncarter (slow), 2014/07/21 20:31:57]

This DCHECK can be dropped; from what I can tell a renderprocesshost is never
without a browsercontext, even before Init().

[kenrb, 2014/07/24 17:53:53]

Removed.

+
+  int parent_routing_id = MSG_ROUTING_NONE;
+  if (frame_tree_node_->parent()) {
+    parent_routing_id = frame_tree_node_->parent()->render_manager()->
+        GetRoutingIdForSiteInstance(site_instance_);
+    CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
+  }
+
+  Send(new FrameMsg_NewFrameProxy(
+      routing_id_,
+      parent_routing_id,
+      frame_tree_node_->frame_tree()->GetRenderViewHost(
+          site_instance_)->GetRoutingID()));
+
+  return true;
+}
+
 }  // namespace content