Have the unload event execute in background on cross-site navigations

content/browser/frame_host/frame_tree.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/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 160 matching lines @@
 
 RenderViewHostImpl* FrameTree::CreateRenderViewHostForMainFrame(
     SiteInstance* site_instance,
     int routing_id,
     int main_frame_routing_id,
     bool swapped_out,
     bool hidden) {
   DCHECK(main_frame_routing_id != MSG_ROUTING_NONE);
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
-  CHECK(iter == render_view_host_map_.end());
+  if (iter != render_view_host_map_.end()) {
+    // If a RenderViewHost is pending shutdown for this |site_instance|, put it
+    // in the map of RenderViewHost pending shutdown. Otherwise there should not

[Charlie Reis, 2014/01/31 19:11:55]

nit: RenderViewHosts

[clamy, 2014/02/05 14:21:42]

Done.

+    // be a RenderViewHost for the site instance.

[Charlie Reis, 2014/01/31 19:11:55]

nit: SiteInstance

[clamy, 2014/02/05 14:21:42]

Done.

+    CHECK_EQ(RenderViewHostImpl::STATE_PENDING_SHUTDOWN,
+             iter->second->rvh_state());
+    render_view_host_pending_shutdown_map_.insert(
+        std::pair<int, RenderViewHostImpl*>(site_instance->GetId(),
+                                            iter->second));
+    render_view_host_map_.erase(iter);
+  }
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       RenderViewHostFactory::Create(site_instance,
                                     render_view_delegate_,
                                     render_widget_delegate_,
                                     routing_id,
                                     main_frame_routing_id,
                                     swapped_out,
                                     hidden));
 
-  render_view_host_map_[site_instance->GetId()] =
-      RenderViewHostRefCount(rvh, 0);
+  render_view_host_map_[site_instance->GetId()] = rvh;
   return rvh;
 }
 
 RenderViewHostImpl* FrameTree::GetRenderViewHostForSubFrame(
     SiteInstance* site_instance) {
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   // TODO(creis): Mirror the frame tree so this check can't fail.
   if (iter == render_view_host_map_.end())
     return NULL;
-  RenderViewHostRefCount rvh_refcount = iter->second;
-  return rvh_refcount.first;
+  return iter->second;
 }
 
 void FrameTree::RegisterRenderFrameHost(
     RenderFrameHostImpl* render_frame_host) {
   SiteInstance* site_instance =
       render_frame_host->render_view_host()->GetSiteInstance();
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance->GetId());
   CHECK(iter != render_view_host_map_.end());
 
-  // Increment the refcount.
-  CHECK_GE(iter->second.second, 0);
-  iter->second.second++;
+  iter->second->increment_ref_count();
 }
 
 void FrameTree::UnregisterRenderFrameHost(
     RenderFrameHostImpl* render_frame_host) {
   SiteInstance* site_instance =
       render_frame_host->render_view_host()->GetSiteInstance();
+  int32 site_instance_id = site_instance->GetId();
   RenderViewHostMap::iterator iter =
-      render_view_host_map_.find(site_instance->GetId());
-  CHECK(iter != render_view_host_map_.end());
-
-  // Decrement the refcount and shutdown the RenderViewHost if no one else is
-  // using it.
-  CHECK_GT(iter->second.second, 0);
-  iter->second.second--;
-  if (iter->second.second == 0) {
-    iter->second.first->Shutdown();
-    render_view_host_map_.erase(iter);
+      render_view_host_map_.find(site_instance_id);
+  if (iter != render_view_host_map_.end() &&
+      iter->second == render_frame_host->render_view_host()) {
+    // Decrement the refcount and shutdown the RenderViewHost if no one else is
+    // using it.
+    CHECK_GT(iter->second->ref_count(), 0);
+    iter->second->decrement_ref_count();
+    if (iter->second->ref_count() == 0) {
+      iter->second->Shutdown();
+      render_view_host_map_.erase(iter);
+    }
+  } else {
+    // The RenderViewHost should be in the list of RenderViewHosts pending
+    // shutdown.
+    bool render_view_host_found = false;
+    std::pair<RenderViewHostMultiMap::iterator,
+              RenderViewHostMultiMap::iterator> result =
+        render_view_host_pending_shutdown_map_.equal_range(site_instance_id);
+    for (RenderViewHostMultiMap::iterator multi_iter = result.first;
+         multi_iter != result.second;
+         ++multi_iter) {
+      if (multi_iter->second != render_frame_host->render_view_host())

[Charlie Reis, 2014/01/31 19:11:55]

nit: Let's go ahead and put multi_iter->second into a rvh local variable, which
will make this code a bit easier to read.

[clamy, 2014/02/05 14:21:42]

Done.

+        continue;
+      render_view_host_found = true;
+      // Decrement the refcount and shutdown the RenderViewHost if no one else
+      // is using it.
+      CHECK_GT(multi_iter->second->ref_count(), 0);
+      multi_iter->second->decrement_ref_count();
+      if (multi_iter->second->ref_count() == 0) {
+        multi_iter->second->Shutdown();
+        render_view_host_pending_shutdown_map_.erase(multi_iter);
+      }
+      break;
+    }
+    CHECK(render_view_host_found);
   }
 }
 
 FrameTreeNode* FrameTree::FindByFrameID(int64 frame_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForFrameId, frame_id, &node));
   return node;
 }
 
 }  // namespace content