Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 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/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_factory.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_factory.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 
 namespace content {
 
 namespace {
 // Used with FrameTree::ForEach() to search for the FrameTreeNode
 // corresponding to |frame_tree_node_id|.
 bool FrameTreeNodeForId(int64 frame_tree_node_id,
                         FrameTreeNode** out_node,
                         FrameTreeNode* node) {
   if (node->frame_tree_node_id() == frame_tree_node_id) {
@@ skipping 73 matching lines @@
                                          int64 parent_frame_id,
                                          int64 frame_id,
                                          const std::string& frame_name) {
   FrameTreeNode* parent = FindByFrameID(parent_frame_id);
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!parent)
     return NULL;
 
   scoped_ptr<FrameTreeNode> node(CreateNode(
-      frame_id, frame_name, render_frame_host_id, parent));
-  RenderFrameHostImpl* render_frame = node->render_frame_host();
-  parent->AddChild(node.Pass());
+      frame_id, frame_name, parent->navigator()));
+  RenderFrameHostImpl* render_frame = node->current_render_frame_host();
+  parent->AddChild(node.Pass(), render_frame_host_id);
   return render_frame;
 }
 
 void FrameTree::RemoveFrame(RenderFrameHostImpl* render_frame_host,
                             int64 parent_frame_id,
                             int64 frame_id) {
   // If switches::kSitePerProcess is not specified, then the FrameTree only
   // contains a node for the root element. However, even in this case
   // frame detachments need to be broadcast outwards.
   //
@@ skipping 19 matching lines @@
   FrameTreeNode* node = FindByFrameID(frame_id);
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!node)
     return;
 
   if (node)
     node->set_current_url(url);
 }
 
-void FrameTree::SwapMainFrame(RenderFrameHostImpl* render_frame_host) {
-  return root_->ResetForMainFrame(render_frame_host);
+void FrameTree::ResetForMainFrameSwap() {
+  return root_->ResetForMainFrameSwap();
 }
 
 RenderFrameHostImpl* FrameTree::GetMainFrame() const {
-  return root_->render_frame_host();
+  return root_->current_render_frame_host();
 }
 
 void FrameTree::SetFrameRemoveListener(
     const base::Callback<void(RenderViewHostImpl*, int64)>& on_frame_removed) {
   on_frame_removed_ = on_frame_removed;
 }
 
+RenderViewHostImpl* FrameTree::GetRenderViewHostForNewFrame(
+    SiteInstance* site_instance,
+    int routing_id,
+    int main_frame_routing_id,
+    bool swapped_out,
+    bool hidden) {
+  RenderViewHostMap::iterator iter =
+      render_view_host_map_.find(site_instance->GetId());
+  RenderViewHostImpl* rvh = NULL;
+  if (iter != render_view_host_map_.end()) {
+    RenderViewHostRefCount rvh_refcount = iter->second;
+    rvh = rvh_refcount.first;
+  } else {
+    rvh = static_cast<RenderViewHostImpl*>(
+        RenderViewHostFactory::Create(site_instance,
+                                      render_view_delegate_,
+                                      render_widget_delegate_,
+                                      routing_id,
+                                      main_frame_routing_id,
+                                      swapped_out,
+                                      hidden));
+
+    render_view_host_map_[site_instance->GetId()] =
+        RenderViewHostRefCount(rvh, 0);
+  }
+  return rvh;
+}
+
+void FrameTree::RegisterRenderFrameHost(
+    RenderFrameHostImpl* render_frame_host) {
+  SiteInstance* site_instance =
+      render_frame_host->render_view_host()->GetSiteInstance();
+  RenderViewHostMap::iterator iter =
+      render_view_host_map_.find(site_instance->GetId());
+  CHECK(iter != render_view_host_map_.end());
+
+  // Increment the refcount.
+  CHECK_GE(iter->second.second, 0);
+  iter->second.second++;
+}
+
+void FrameTree::UnregisterRenderFrameHost(
+    RenderFrameHostImpl* render_frame_host) {
+  SiteInstance* site_instance =
+      render_frame_host->render_view_host()->GetSiteInstance();
+  RenderViewHostMap::iterator iter =
+      render_view_host_map_.find(site_instance->GetId());
+  CHECK(iter != render_view_host_map_.end());
+
+  // Decrement the refcount and shutdown the RenderViewHost if no one else is
+  // using it.
+  CHECK_GT(iter->second.second, 0);
+  iter->second.second--;
+  if (iter->second.second == 0) {
+    iter->second.first->Shutdown();
+    render_view_host_map_.erase(iter);
+  }
+}
+
 FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node));
   return node;
 }
 
 scoped_ptr<FrameTreeNode> FrameTree::CreateNode(
     int64 frame_id,
     const std::string& frame_name,
-    int render_frame_host_id,
-    FrameTreeNode* parent_node) {
+    Navigator* navigator) {
   scoped_ptr<FrameTreeNode> frame_tree_node(new FrameTreeNode(
-      parent_node->navigator(), render_frame_delegate_, render_view_delegate_,
+      navigator, render_frame_delegate_, render_view_delegate_,
       render_widget_delegate_, manager_delegate_, frame_id, frame_name));
-
-  scoped_ptr<RenderFrameHostImpl> render_frame_host(
-      RenderFrameHostFactory::Create(
-          parent_node->render_frame_host()->render_view_host(),
-          parent_node->render_frame_host()->delegate(),
-          this,
-          frame_tree_node.get(),
-          render_frame_host_id,
-          false));
-
-  frame_tree_node->set_render_frame_host(render_frame_host.release(), true);
   return frame_tree_node.Pass();
 }
 
 }  // namespace content