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 142 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_->GetEmbedderFrameTreeNodeID();
+  FrameTreeNode* embedder_frame_tree_node =
+      FrameTreeNode::GloballyFindByID(embedder_frame_tree_node_id);
+  if (!embedder_frame_tree_node)
+    return NULL;

[Charlie Reis, 2015/04/30 23:06:46]

nullptr

[lazyboy, 2015/05/05 07:28:13]

Done.

+
+  return GetRenderFrameProxyHost(
+      embedder_frame_tree_node->current_frame_host()->GetSiteInstance());
+}
+
 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 280 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"));
+    // TODO(lazyboy): This probably breaks guest visibility.
+    current_host()->GetView()->Show();

[Charlie Reis, 2015/04/30 23:06:46]

This is not the right place to call Show.  Please put it with the other Show()
call in CommitPending.

[lazyboy, 2015/05/05 07:28:13]

There's no CommitPending() pending call as swapping is done manually w/o
CreatePending/CommitPending.

However the TODO in line above still needs to be addressed, I'll revisit once I
have a better solution to calling Show() altogether, by then it might be a non
issue.

+  }
+
   if (!pending_render_frame_host_ && !speculative_render_frame_host_) {
     DCHECK_IMPLIES(should_reuse_web_ui_, web_ui_);
 
     // We should only hear this from our current renderer.
     DCHECK_EQ(render_frame_host_, render_frame_host);
 
     // Even when there is no pending RVH, there may be a pending Web UI.
     if (pending_web_ui() || speculative_web_ui_)
       CommitPending();
     return;
@@ skipping 1111 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());
 }
 
+void RenderFrameHostManager::CreateEmbedderProxy(
+    SiteInstance* embedder_site_instance,
+    int* swapped_out_render_view_routing_id,
+    int* proxy_routing_id) {
+  DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kSitePerProcess));
+  int embedder_proxy_flags =
+      CREATE_RF_HIDDEN |
+      CREATE_RF_SWAPPED_OUT |
+      CREATE_RF_FOR_MAIN_FRAME_NAVIGATION;  // TODO(lazyboy): Do we need this?

[Charlie Reis, 2015/04/30 23:06:46]

This affects |for_main_frame_navigation| in
WebContentsImpl::CreateRenderViewForRenderManager, making it decide between
RWH::CreateViewForWidget (for main frames) and creating a new
RenderWidgetHostViewChildFrame (for subframes).

I'm not sure which approach you need.  This is the guest's RVH, so I'm guessing
it will need the main frame case (even though it will never get swapped in).

[lazyboy, 2015/05/05 07:28:13]

Keeping FOR_MAIN_FRAME_NAVIGATION.
(there's also another comment in WebContentsImpl related to this).

+  scoped_ptr<RenderFrameHostImpl> so_rfh_in_embedder =

[Charlie Reis, 2015/04/30 23:06:45]

swapped_out_embedder_rfh

[lazyboy, 2015/05/05 07:28:13]

Done.

+      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);
+  *proxy_routing_id = rfph_in_embedder->GetRoutingID();
+}
+
+void RenderFrameHostManager::ReplaceWithGuestProxy(
+    int proxy_to_embedder_routing_id) {
+  current_frame_host()->Send(
+      new FrameMsg_ReplaceLocalFrameWithProxy(

[Charlie Reis, 2015/04/30 23:06:45]

(I'm wondering if we should find a way to unify this with SwapOut.  See my
comments in render_frame_impl.cc.)

[lazyboy, 2015/05/05 07:28:13]

Done as I got rid of the new IPC, using SwapOut IPC instead.

+          current_frame_host()->GetRoutingID(),
+          proxy_to_embedder_routing_id));
+}
+
+void RenderFrameHostManager::UpdateGuestRWHView(
+    RenderWidgetHostView* child_rwhv) {
+  GetProxyToEmbedder()->SetChildRWHView(child_rwhv);
+}
+
 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 481 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