Support cross-process navigations in a single subframe RenderFrameHost.

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/debug/trace_event.h"
@@ skipping 172 matching lines @@
     if (!InitRenderView(dest_render_frame_host->render_view_host(),
                         opener_route_id))
       return NULL;
 
     // Now that we've created a new renderer, be sure to hide it if it isn't
     // our primary one.  Otherwise, we might crash if we try to call Show()
     // on it later.
     if (dest_render_frame_host != render_frame_host_ &&
         dest_render_frame_host->render_view_host()->GetView()) {
       dest_render_frame_host->render_view_host()->GetView()->Hide();
-    } else {
+    } else if (frame_tree_node_->IsMainFrame()) {
       // This is our primary renderer, notify here as we won't be calling
-      // CommitPending (which does the notify).
+      // CommitPending (which does the notify).  We only do this for top-level
+      // frames.
       delegate_->NotifySwappedFromRenderManager(
           NULL, render_frame_host_->render_view_host());
     }
   }
 
   // TODO(creis): Return the RFH instead, once we can navigate RFHs.
   return dest_render_frame_host->render_view_host();
 }
 
 void RenderFrameHostManager::Stop() {
@@ skipping 268 matching lines @@
   // must be done separately from SwapOut, so that the PageGroupLoadDeferrer is
   // no longer on the stack when we send the SwapOut message.
   delegate_->CancelModalDialogsForRenderManager();
 
   // Tell the old renderer it is being swapped out.  This will fire the unload
   // handler (without firing the beforeunload handler a second time).  When the
   // unload handler finishes and the navigation completes, we will send a
   // message to the ResourceDispatcherHost, allowing the pending RVH's response
   // to resume.
   // TODO(creis): We should do this on the RFH or else we'll swap out the
-  // top-level page when subframes navigate.
-  render_frame_host_->render_view_host()->SwapOut();
+  // top-level page when subframes navigate.  Until then, we skip swapping out
+  // for subframes.
+  if (frame_tree_node_->IsMainFrame())
+    render_frame_host_->render_view_host()->SwapOut();
+  else
+    SwappedOut(render_frame_host_->render_view_host());
 
   // ResourceDispatcherHost has told us to run the onunload handler, which
   // means it is not a download or unsafe page, and we are going to perform the
   // navigation.  Thus, we no longer need to remember that the RenderViewHost
   // is part of a pending cross-site request.
   if (pending_render_frame_host_) {
     pending_render_frame_host_->render_view_host()->
         SetHasPendingCrossSiteRequest(false);
   }
 }
@@ skipping 273 matching lines @@
     frame_routing_id = site_instance->GetProcess()->GetNextRoutingID();
 
   // Create a RVH for main frames, or find the existing one for subframes.
   FrameTree* frame_tree = frame_tree_node_->frame_tree();
   RenderViewHostImpl* render_view_host = NULL;
   if (frame_tree_node_->IsMainFrame()) {
     render_view_host = frame_tree->CreateRenderViewHostForMainFrame(
         site_instance, view_routing_id, frame_routing_id, swapped_out, hidden);
   } else {
     render_view_host = frame_tree->GetRenderViewHostForSubFrame(site_instance);
+
+    // If we haven't found a RVH for a subframe RFH, it's because we currently
+    // do not create top-level RFHs for pending subframe navigations.  Create
+    // the RVH here for now.
+    // TODO(creis): Mirror the frame tree so this check isn't necessary.
+    if (!render_view_host) {
+      render_view_host = frame_tree->CreateRenderViewHostForMainFrame(
+          site_instance, view_routing_id, frame_routing_id, swapped_out,
+          hidden);
+    }
   }
 
   // TODO(creis): Make render_frame_host a scoped_ptr.
   // TODO(creis): Pass hidden to RFH.
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostFactory::Create(render_view_host,
                                      render_frame_delegate_,
                                      frame_tree,
                                      frame_tree_node_,
                                      frame_routing_id,
@@ skipping 36 matching lines @@
     } else {
       new_render_frame_host->GetProcess()->AddPendingView();
     }
 
     RenderViewHostImpl* render_view_host =
         new_render_frame_host->render_view_host();
     bool success = InitRenderView(render_view_host, opener_route_id);
     if (success && frame_tree_node_->IsMainFrame()) {
       // Don't show the main frame's view until we get a DidNavigate from it.
       render_view_host->GetView()->Hide();
-    } else if (!swapped_out) {
+    } else if (!swapped_out && pending_render_frame_host_) {
       CancelPending();
     }
   }
 
   // Use this as our new pending RFH if it isn't swapped out.
   if (!swapped_out)
     pending_render_frame_host_ = new_render_frame_host;
 
   return new_render_frame_host->render_view_host()->GetRoutingID();
 }
@@ skipping 55 matching lines @@
       delegate_->SetFocusToLocationBar(false);
     return;
   }
 
   // Remember if the page was focused so we can focus the new renderer in
   // that case.
   bool focus_render_view = !will_focus_location_bar &&
       render_frame_host_->render_view_host()->GetView() &&
       render_frame_host_->render_view_host()->GetView()->HasFocus();
 
+  // TODO(creis): As long as show/hide are on RVH, we don't want to do them for
+  // subframe navigations or they'll interfere with the top-level page.
+  bool is_main_frame = frame_tree_node_->IsMainFrame();
+
   // Swap in the pending frame and make it active. Also ensure the FrameTree
   // stays in sync.
   RenderFrameHostImpl* old_render_frame_host = render_frame_host_;
   render_frame_host_ = pending_render_frame_host_;
   pending_render_frame_host_ = NULL;
-  render_frame_host_->render_view_host()->AttachToFrameTree();
+  if (is_main_frame)
+    render_frame_host_->render_view_host()->AttachToFrameTree();
 
   // The process will no longer try to exit, so we can decrement the count.
   render_frame_host_->GetProcess()->RemovePendingView();
 
-  // TODO(creis): As long as show/hide are on RVH, we don't want to do them for
-  // subframe navigations or they'll interfere with the top-level page.
-  bool is_main_frame = frame_tree_node_->IsMainFrame();
-
   // If the view is gone, then this RenderViewHost died while it was hidden.
   // We ignored the RenderProcessGone call at the time, so we should send it now
   // to make sure the sad tab shows up, etc.
   if (!render_frame_host_->render_view_host()->GetView()) {
     delegate_->RenderProcessGoneFromRenderManager(
         render_frame_host_->render_view_host());
   } else if (!delegate_->IsHidden() && is_main_frame) {
     render_frame_host_->render_view_host()->GetView()->Show();
   }
 
-  // Hide the old view now that the new one is visible.
+  // If the old view is live and top-level, hide it now that the new one is
+  // visible.
   if (old_render_frame_host->render_view_host()->GetView()) {
-    old_render_frame_host->render_view_host()->GetView()->Hide();
-    old_render_frame_host->render_view_host()->WasSwappedOut();
+    if (is_main_frame) {
+      old_render_frame_host->render_view_host()->GetView()->Hide();
+      old_render_frame_host->render_view_host()->WasSwappedOut();
+    } else {
+      // TODO(creis): Swap out the subframe. We'll need to swap it back in when
+      // navigating back.
+    }
   }
 
   // Make sure the size is up to date.  (Fix for bug 1079768.)
   delegate_->UpdateRenderViewSizeForRenderManager();
 
   if (will_focus_location_bar) {
     delegate_->SetFocusToLocationBar(false);
   } else if (focus_render_view &&
              render_frame_host_->render_view_host()->GetView()) {
     RenderWidgetHostViewPort::FromRWHV(
@@ skipping 10 matching lines @@
         render_frame_host_->render_view_host());
   }
 
   // If the pending frame was on the swapped out list, we can remove it.
   swapped_out_hosts_.erase(render_frame_host_->render_view_host()->
                                GetSiteInstance()->GetId());
 
   if (old_render_frame_host->render_view_host()->IsRenderViewLive()) {
     // If the old RFH is live, we are swapping it out and should keep track of
     // it in case we navigate back to it.
-    DCHECK(old_render_frame_host->render_view_host()->is_swapped_out());
+    // TODO(creis): Swap out the subframe in --site-per-process.
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess))
+      DCHECK(old_render_frame_host->render_view_host()->is_swapped_out());
     // Temp fix for http://crbug.com/90867 until we do a better cleanup to make
     // sure we don't get different rvh instances for the same site instance
     // in the same rvhmgr.
     // TODO(creis): Clean this up.
     int32 old_site_instance_id =
         old_render_frame_host->render_view_host()->GetSiteInstance()->GetId();
     RenderFrameHostMap::iterator iter =
         swapped_out_hosts_.find(old_site_instance_id);
     if (iter != swapped_out_hosts_.end() &&
         iter->second != old_render_frame_host) {
@@ skipping 305 matching lines @@
     SiteInstance* instance) const {
   RenderFrameHostMap::const_iterator iter =
       swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }
 
 }  // namespace content