Don't let swappedout:// page be visible when updating frame tree.

content/browser/web_contents/render_view_host_manager.cc

 // Copyright (c) 2012 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/web_contents/render_view_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 239 matching lines @@
 
   RenderViewHostImpl* render_view_host_impl = static_cast<RenderViewHostImpl*>(
       render_view_host);
 
   for (RenderViewHostMap::iterator iter = swapped_out_hosts_.begin();
        iter != swapped_out_hosts_.end();
        ++iter) {
     DCHECK_NE(iter->second->GetSiteInstance(),
         current_host()->GetSiteInstance());
 
-    iter->second->UpdateFrameTree(
-        render_view_host_impl->GetProcess()->GetID(),
-        render_view_host_impl->GetRoutingID(),
-        render_view_host_impl->frame_tree());
+    // Send updates to the other swapped out RVHs, unless it's the pending RVH
+    // (which is in the process of navigating).
+    // TODO(creis): Remove the pending RVH from swapped_out_hosts_.
+    // TODO(nasko): Don't send updates across BrowsingInstances.

[nasko, 2012/09/20 22:18:04]

nit: You can put in crbug.com/150855 for my TODO.

[Charlie Reis, 2012/09/20 23:25:38]

Done.

+    if (iter->second != pending_render_view_host_) {
+      iter->second->UpdateFrameTree(
+          render_view_host_impl->GetProcess()->GetID(),
+          render_view_host_impl->GetRoutingID(),
+          render_view_host_impl->frame_tree());
+    }
   }
 }
 
 void RenderViewHostManager::SetWebUIPostCommit(WebUIImpl* web_ui) {
   DCHECK(!web_ui_.get());
   web_ui_.reset(web_ui);
 }
 
 void RenderViewHostManager::RendererAbortedProvisionalLoad(
     RenderViewHost* render_view_host) {
@@ skipping 690 matching lines @@
 }
 
 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(
     SiteInstance* instance) {
   RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }