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

content/browser/frame_host/render_frame_host_manager.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/render_frame_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 143 matching lines @@
                             ->render_manager()
                             ->current_frame_host()
                             ->GetSiteInstance()
                             ->GetId());
   if (iter == proxy_hosts_.end())
     return NULL;
 
   return iter->second;
 }
 
+RenderFrameProxyHost* RenderFrameHostManager::GetProxyToEmbedder() {
+  int64 embedder_frame_tree_node_id = delegate_->GetParentFrameTreeNodeID();
+  FrameTreeNode* embedder_frame_tree_node =
+      FrameTreeNode::GloballyFindByID(embedder_frame_tree_node_id);
+  if (!embedder_frame_tree_node)
+    return NULL;
+  RenderFrameProxyHostMap::iterator iter =

[Charlie Reis, 2015/04/08 23:42:11]

Just use RenderFrameHostManager::GetRenderFrameProxyHost.

[lazyboy, 2015/04/14 01:38:03]

Done.

+      proxy_hosts_.find(embedder_frame_tree_node->render_manager()

[Charlie Reis, 2015/04/08 23:42:10]

Use FrameTreeNode::current_frame_host(), skipping the render_manager() call.

[lazyboy, 2015/04/14 01:38:03]

Done.

+                            ->current_frame_host()->GetSiteInstance()
+                            ->GetId());
+  if (iter == proxy_hosts_.end())
+    return NULL;
+  return iter->second;
+}
+
 void RenderFrameHostManager::SetPendingWebUI(const GURL& url, int bindings) {
   pending_web_ui_ = CreateWebUI(url, bindings);
   pending_and_current_web_ui_.reset();
 }
 
 scoped_ptr<WebUIImpl> RenderFrameHostManager::CreateWebUI(const GURL& url,
                                                           int bindings) {
   scoped_ptr<WebUIImpl> new_web_ui(delegate_->CreateWebUIForRenderManager(url));
 
   // If we have assigned (zero or more) bindings to this NavigationEntry in the
@@ skipping 274 matching lines @@
   CommitPendingIfNecessary(render_frame_host, was_caused_by_user_gesture);
 
   // Make sure any dynamic changes to this frame's sandbox flags that were made
   // prior to navigation take effect.
   CommitPendingSandboxFlags();
 }
 
 void RenderFrameHostManager::CommitPendingIfNecessary(
     RenderFrameHostImpl* render_frame_host,
     bool was_caused_by_user_gesture) {
+  RenderFrameProxyHost* proxy_to_embedder = GetProxyToEmbedder();
+  if (proxy_to_embedder) {
+    DCHECK(render_frame_host->GetSiteInstance()
+               ->GetSiteURL().SchemeIs("chrome-guest"));
+    proxy_to_embedder->SetChildRWHView(current_host()->GetView());

[Charlie Reis, 2015/04/08 23:42:10]

Do you have to do this for every commit in the guest?

[lazyboy, 2015/04/14 01:38:03]

No, only the first time.
I've moved this to WebContentsImpl::CreateRenderViewForRenderManager()

However, the next GetView()->Show() needs to stay here.
Calling it too early in CreateRenderViewFor... doesn't work.
As Fady pointed out, this needs more work, I can investigate this separately.

+    // TODO(lazyboy): This probably breaks guest visibility.
+    current_host()->GetView()->Show();
+  }
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     if (render_frame_host == speculative_render_frame_host_.get()) {
       CommitPending();
     } else if (render_frame_host == render_frame_host_.get()) {
       // TODO(carlosk): this code doesn't properly handle in-page navigation or
       // interwoven navigation requests.
       DCHECK(!speculative_render_frame_host_);
     } else {
       // No one else should be sending us a DidNavigate in this state.
@@ skipping 1052 matching lines @@
     return;
 
   // Recreate the opener chain.
   int opener_route_id =
       delegate_->CreateOpenerRenderViewsForRenderManager(instance);
   RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(instance);
   InitRenderView(render_view_host, opener_route_id, proxy->GetRoutingID(),
                  source->IsMainFrame());
 }
 
+int RenderFrameHostManager::CreateEmbedderProxy(
+    SiteInstance* embedder_site_instance,
+    int* swapped_out_render_view_routing_id) {
+  int embedder_proxy_flags =
+      CREATE_RF_HIDDEN |
+      CREATE_RF_SWAPPED_OUT |
+      CREATE_RF_FOR_MAIN_FRAME_NAVIGATION;  // TODO(lazyboy): Do we need this?
+  scoped_ptr<RenderFrameHostImpl> so_rfh_in_embedder =
+      CreateRenderFrame(
+          embedder_site_instance,
+          nullptr,
+          MSG_ROUTING_NONE,  // opener_route_id
+          embedder_proxy_flags,
+          swapped_out_render_view_routing_id);
+
+  RenderFrameProxyHost* rfph_in_embedder = GetRenderFrameProxyHost(
+      embedder_site_instance);
+  DCHECK(rfph_in_embedder);
+  return rfph_in_embedder->GetRoutingID();
+}
+
+void RenderFrameHostManager::ReplaceWithGuestProxy(
+    int proxy_to_embedder_routing_id) {
+  current_frame_host()->Send(
+      new FrameMsg_ReplaceLocalFrameWithProxy(
+          current_frame_host()->GetRoutingID(),
+          proxy_to_embedder_routing_id));
+}
+
 bool RenderFrameHostManager::InitRenderView(
     RenderViewHostImpl* render_view_host,
     int opener_route_id,
     int proxy_routing_id,
     bool for_main_frame_navigation) {
   // We may have initialized this RenderViewHost for another RenderFrameHost.
   if (render_view_host->IsRenderViewLive())
     return true;
 
   // If the ongoing navigation is to a WebUI and the RenderView is not in a
@@ skipping 479 matching lines @@
 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
     SiteInstance* instance) {
   RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
   if (iter != proxy_hosts_.end()) {
     delete iter->second;
     proxy_hosts_.erase(iter);
   }
 }
 
 }  // namespace content