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

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2cec72d37c399fbaeae723f83b4fe5d3e3ebcfca..931efc75fe68b63ce9a51acb2910c34c0842f1c6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -10,6 +10,7 @@
 #include "content/child/appcache/appcache_dispatcher.h"
 #include "content/child/quota_dispatcher.h"
 #include "content/child/request_extra_data.h"
+#include "content/common/frame_messages.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
@@ -72,6 +73,19 @@ using webkit_glue::WebURLResponseExtraDataImpl;
 
 namespace content {
 
+namespace {
+
+// NOTE: -1 is used by content::FrameTreeNode as an invalid ID.
+long long GenerateFrameIdentifier() {
+    static long long next = 0;
+    return ++next;
+}
+
+typedef std::map<WebKit::WebFrame*, RenderFrameImpl*> FrameMap;
+base::LazyInstance<FrameMap> g_child_frame_map = LAZY_INSTANCE_INITIALIZER;
+
+}  // namespace
+
 static RenderFrameImpl* (*g_create_render_frame_impl)(RenderViewImpl*, int32) =
     NULL;
 
@@ -217,11 +231,29 @@ void RenderFrameImpl::didAccessInitialDocument(WebKit::WebFrame* frame) {
   render_view_->didAccessInitialDocument(frame);
 }
 
-void RenderFrameImpl::didCreateFrame(WebKit::WebFrame* parent,
-                                     WebKit::WebFrame* child) {
-  render_view_->Send(new ViewHostMsg_FrameAttached(
-      render_view_->GetRoutingID(), parent->identifier(), child->identifier(),
-      UTF16ToUTF8(child->assignedName())));
+WebKit::WebFrame* RenderFrameImpl::createMainFrame() {
+  return WebFrame::create(this, GenerateFrameIdentifier());
+}
+
+WebKit::WebFrame* RenderFrameImpl::createChildFrame(WebKit::WebFrame* parent,
+                                                    WebKit::WebString name) {
+  RenderFrameImpl* child_render_frame = this;
+  long long child_frame_identifier = GenerateFrameIdentifier();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
+    int routing_id;
+    Send(new FrameHostMsg_CreateChildFrame(GetRoutingID(),

[Charlie Reis, 2013/09/11 22:25:04]

Maybe emphasize that this is sync?

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

We don't seem to do this in other spots that have sync ipc. I'm inclined not to
clutter it.

+                                           parent->identifier(),
+                                           child_frame_identifier,
+                                           UTF16ToUTF8(name),
+                                           &routing_id));
+    child_render_frame = RenderFrameImpl::Create(render_view_, routing_id);
+  }
+
+  WebKit::WebFrame* web_frame = WebFrame::create(child_render_frame,
+                                                 child_frame_identifier);
+  g_child_frame_map.Get().insert(std::make_pair(web_frame, child_render_frame));
+
+  return web_frame;
 }
 
 void RenderFrameImpl::didDisownOpener(WebKit::WebFrame* frame) {
@@ -245,13 +277,19 @@ void RenderFrameImpl::frameDetached(WebKit::WebFrame* frame) {
   if (frame->parent())
     parent_frame_id = frame->parent()->identifier();
 
-  render_view_->Send(new ViewHostMsg_FrameDetached(render_view_->GetRoutingID(),
-                                                   parent_frame_id,
-                                                   frame->identifier()));
+  render_view_->Send(new FrameHostMsg_Detach(GetRoutingID(), parent_frame_id,
+                                             frame->identifier()));
 
   // Call back to RenderViewImpl for observers to be notified.
   // TODO(nasko): Remove once we have RenderFrameObserver.
   render_view_->frameDetached(frame);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess)) {
+    FrameMap::iterator it = g_child_frame_map.Get().find(frame);
+    DCHECK(it != g_child_frame_map.Get().end());
+    DCHECK_EQ(it->second, this);
+    delete it->second;
+    g_child_frame_map.Get().erase(it);
+  }
 }
 
 void RenderFrameImpl::willClose(WebKit::WebFrame* frame) {