Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1886413002: Always swap with a replacement proxy in OnSwapOut. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Charlie's comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 4e4c97ae48d538e7b08119d120de39de21e31b3a..0b4ce1350063e1138e5e1363fe5fd2befb1dc6bf 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -263,10 +263,10 @@ RenderFrameHostImpl::~RenderFrameHostImpl() {
if (delegate_ && render_frame_created_)
delegate_->RenderFrameDeleted(this);
- // If this RenderFrameHost is swapped out, it already decremented the active
- // frame count of the SiteInstance it belongs to.
- if (is_active())
- GetSiteInstance()->DecrementActiveFrameCount();
+ // If this was the last active frame in the SiteInstance, the
+ // DecrementActiveFrameCount call will trigger the deletion of the
+ // SiteInstance's proxies.
+ GetSiteInstance()->DecrementActiveFrameCount();
// If this RenderFrameHost is swapping with a RenderFrameProxyHost, the
// RenderFrame will already be deleted in the renderer process. Main frame
@@ -1214,17 +1214,17 @@ void RenderFrameHostImpl::SwapOut(
RenderViewHostImpl::kUnloadTimeoutMS));
}
- // There may be no proxy if there are no active views in the process.
- int proxy_routing_id = MSG_ROUTING_NONE;
- FrameReplicationState replication_state;
- if (proxy) {
- set_render_frame_proxy_host(proxy);
- proxy_routing_id = proxy->GetRoutingID();
- replication_state = proxy->frame_tree_node()->current_replication_state();
- }
+ // There should always be a proxy to replace the old RenderFrameHost. If
+ // there are no remaining active views in the process, the proxy will be
+ // short-lived and will be deleted when the SwapOut ACK is received.
+ CHECK(proxy);
+
+ set_render_frame_proxy_host(proxy);
nasko 2016/04/26 19:41:02 Ugh, this isn't needed, but I'll get rid of it in
if (IsRenderFrameLive()) {
- Send(new FrameMsg_SwapOut(routing_id_, proxy_routing_id, is_loading,
+ FrameReplicationState replication_state =
+ proxy->frame_tree_node()->current_replication_state();
+ Send(new FrameMsg_SwapOut(routing_id_, proxy->GetRoutingID(), is_loading,
replication_state));
}
@@ -1234,11 +1234,6 @@ void RenderFrameHostImpl::SwapOut(
if (frame_tree_node_->IsMainFrame())
render_view_host_->set_is_active(false);
- // If this is the last active frame in the SiteInstance, the
- // DecrementActiveFrameCount call will trigger the deletion of the
- // SiteInstance's proxies.
- GetSiteInstance()->DecrementActiveFrameCount();
-
if (!GetParent())
delegate_->SwappedOut(this);
}
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698