Create a new RenderFrameHost per child frame when --site-per-process is enabled.

content/browser/renderer_host/render_view_host_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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/host_zoom_map_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
+#include "content/browser/renderer_host/frame_tree.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/speech_recognition_messages.h"
 #include "content/common/swapped_out_messages.h"
@@ skipping 135 matching lines @@
       are_javascript_messages_suppressed_(false),
       sudden_termination_allowed_(false),
       render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) {
   DCHECK(instance_.get());
   CHECK(delegate_);  // http://crbug.com/82827
 
   if (main_frame_routing_id == MSG_ROUTING_NONE)
     main_frame_routing_id = GetProcess()->GetNextRoutingID();
 
   main_render_frame_host_.reset(
-      new RenderFrameHostImpl(this, main_frame_routing_id, is_swapped_out_));
+      new RenderFrameHostImpl(GetProcess(), delegate_->GetFrameTree(),
+                              main_frame_routing_id, is_swapped_out_));
 
   GetProcess()->EnableSendQueue();
 
   for (size_t i = 0; i < g_created_callbacks.Get().size(); i++)
     g_created_callbacks.Get().at(i).Run(this);
 
   if (!swapped_out)
     instance_->increment_active_view_count();
 
 #if defined(OS_ANDROID)
@@ skipping 50 matching lines @@
   // page ID it might be asked to render.
   int32 next_page_id = 1;
   if (max_page_id > -1)
     next_page_id = max_page_id + 1;
 
   ViewMsg_New_Params params;
   params.renderer_preferences =
       delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext());
   params.web_preferences = delegate_->GetWebkitPrefs();
   params.view_id = GetRoutingID();
-  params.main_frame_routing_id = main_render_frame_host_->routing_id();
+  params.main_frame_routing_id = main_render_frame_host()->routing_id();
   params.surface_id = surface_id();
   params.session_storage_namespace_id =
       delegate_->GetSessionStorageNamespace(instance_)->id();
   params.frame_name = frame_name;
   // Ensure the RenderView sets its opener correctly.
   params.opener_route_id = opener_route_id;
   params.swapped_out = is_swapped_out_;
   params.hidden = is_hidden();
   params.next_page_id = next_page_id;
   GetWebScreenInfo(&params.screen_info);
@@ skipping 1759 matching lines @@
                         params.item_font_size,
                         params.selected_item,
                         params.popup_items,
                         params.right_aligned,
                         params.allow_multiple_selection);
   }
 }
 #endif
 
 RenderFrameHostImpl* RenderViewHostImpl::main_render_frame_host() const {
-  DCHECK_EQ(GetProcess(), main_render_frame_host_->GetProcess());
-  return main_render_frame_host_.get();
+  // TODO(ajwong): Rename this function.
+  RenderFrameHostImpl* render_frame_host = main_render_frame_host_.get();
+  if (!render_frame_host)
+    render_frame_host = delegate_->GetFrameTree()->GetMainFrame();
+  DCHECK_EQ(GetProcess(), render_frame_host->GetProcess());
+  return render_frame_host;
 }
 
 void RenderViewHostImpl::SetSwappedOut(bool is_swapped_out) {
   // We update the number of RenderViews in a SiteInstance when the
   // swapped out status of this RenderView gets flipped.
   if (is_swapped_out_ && !is_swapped_out)
     instance_->increment_active_view_count();
   else if (!is_swapped_out_ && is_swapped_out)
     instance_->decrement_active_view_count();
 
@@ skipping 14 matching lines @@
 
   const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles();
   for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();
        file != file_paths.end(); ++file) {
     if (!policy->CanReadFile(GetProcess()->GetID(), *file))
       return false;
   }
   return true;
 }
 
+void RenderViewHostImpl::SwapIntoFrameTree(
+    RenderViewHostImpl* old_render_view_host) {
+  FrameTree* frame_tree = delegate_->GetFrameTree();
+  if (old_render_view_host) {
+      old_render_view_host->main_render_frame_host_ =
+          frame_tree->SwapMainFrame(main_render_frame_host_.Pass());
+  } else {
+    frame_tree->SwapMainFrame(main_render_frame_host_.Pass());
+  }
+
+  if (main_frame_id() != -1) {

[nasko, 2013/09/11 22:26:24]

Why not use the kInvalidFrameId constant here?

[awong, 2013/09/21 01:19:56]

Done.

+    frame_tree->OnFirstNavigation(main_frame_id());
+  }
+}
+
 }  // namespace content