Make <webview> use out-of-process iframe architecture.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 952b0b0fd17d83e732369f61780de207194629c2..56e8cd1543b4dab0776222da855fc2e630ba1e99 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -144,6 +144,19 @@ RenderWidgetHostView* RenderFrameHostManager::GetRenderWidgetHostView() const {
   return nullptr;
 }
 
+RenderWidgetHostImpl*
+RenderFrameHostManager::GetOuterRenderWidgetHostForKeyboardInput() {
+  if (!ForInnerDelegate())
+    return nullptr;
+
+  FrameTreeNode* outer_contents_frame_tree_node =
+      FrameTreeNode::GloballyFindByID(
+          delegate_->GetOuterDelegateFrameTreeNodeID());
+  return outer_contents_frame_tree_node->parent()
+      ->current_frame_host()
+      ->render_view_host();
+}
+
 RenderFrameProxyHost* RenderFrameHostManager::GetProxyToParent() {
   if (frame_tree_node_->IsMainFrame())
     return NULL;
@@ -160,6 +173,38 @@ RenderFrameProxyHost* RenderFrameHostManager::GetProxyToParent() {
   return iter->second;
 }
 
+RenderFrameProxyHost* RenderFrameHostManager::GetProxyToOuterDelegate() {
+  int outer_contents_frame_tree_node_id =
+      delegate_->GetOuterDelegateFrameTreeNodeID();
+  FrameTreeNode* outer_contents_frame_tree_node =
+      FrameTreeNode::GloballyFindByID(outer_contents_frame_tree_node_id);
+  if (!outer_contents_frame_tree_node ||
+      !outer_contents_frame_tree_node->parent()) {
+    return nullptr;
+  }
+
+  return GetRenderFrameProxyHost(outer_contents_frame_tree_node->parent()
+                                     ->current_frame_host()
+                                     ->GetSiteInstance());
+}
+
+bool RenderFrameHostManager::ForInnerDelegate() {
+  // TODO(lazyboy): Subframes inside inner WebContents needs to be tested and
+  // we have to make sure that IsMainFrame() check below is appropriate.

[nasko, 2015/06/15 23:00:13]

File a bug and note it here, just to make sure we don't lose track of this work,
as it is important.

[lazyboy, 2015/06/16 17:59:51]

Done.

+  return frame_tree_node_->IsMainFrame() &&
+         delegate_->GetOuterDelegateFrameTreeNodeID() !=
+              FrameTreeNode::FRAME_TREE_NODE_ID_NONE;
+}
+
+void RenderFrameHostManager::RemoveOuterDelegateFrame() {
+  FrameTreeNode* outer_delegate_frame_tree_node =
+      FrameTreeNode::GloballyFindByID(
+          delegate_->GetOuterDelegateFrameTreeNodeID());
+  DCHECK(outer_delegate_frame_tree_node->parent());
+  outer_delegate_frame_tree_node->frame_tree()->RemoveFrame(
+      outer_delegate_frame_tree_node);
+}
+
 void RenderFrameHostManager::SetPendingWebUI(const GURL& url, int bindings) {
   pending_web_ui_ = CreateWebUI(url, bindings);
   pending_and_current_web_ui_.reset();
@@ -1647,6 +1692,27 @@ void RenderFrameHostManager::EnsureRenderViewInitialized(
   proxy->set_render_frame_proxy_created(true);
 }
 
+void RenderFrameHostManager::CreateOuterDelegateProxy(
+    SiteInstance* outer_contents_site_instance,
+    RenderFrameHostImpl* render_frame_host) {
+  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSitePerProcess));
+  RenderFrameProxyHost* proxy = new RenderFrameProxyHost(
+      outer_contents_site_instance, nullptr, frame_tree_node_);
+  proxy_hosts_[outer_contents_site_instance->GetId()] = proxy;
+
+  render_frame_host->Send(
+      new FrameMsg_SwapOut(render_frame_host->GetRoutingID(),
+                           proxy->GetRoutingID(), false /* is_loading */,
+                           FrameReplicationState()));
+  proxy->set_render_frame_proxy_created(true);
+}
+
+void RenderFrameHostManager::SetRWHViewForInnerContents(
+    RenderWidgetHostView* child_rwhv) {
+  GetProxyToOuterDelegate()->SetChildRWHView(child_rwhv);

[nasko, 2015/06/15 23:00:13]

The comment mentions that this should only be called for inner WebContents, but
we don't enforce this here. Add a DCHECK?

[lazyboy, 2015/06/16 17:59:51]

Added DCHECK.
Done.

+}
+
 bool RenderFrameHostManager::InitRenderView(
     RenderViewHostImpl* render_view_host,
     int opener_route_id,