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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2496233003: Destroy the old RenderWidgetHostView when swapping out a main frame. (Closed)
Patch Set: Created 4 years, 1 month 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/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 367951acc517b810c354a23f9e2958c869927969..d3cc7353eeed960b309de0d7743851fbe4b0b2c1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4858,14 +4858,13 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
TRACE_EVENT0("browser,navigation",
"WebContentsImpl::CreateRenderViewForRenderManager");
- if (proxy_routing_id == MSG_ROUTING_NONE)
+ RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(render_view_host);
+
+ if (!rvhi->is_swapped_out())
lfg 2016/11/15 04:37:34 This is also a no-op, but it makes it easier to un
Charlie Reis 2016/11/15 19:59:05 When you say no-op, you mean is_swapped_out() and
alexmos 2016/11/17 17:55:57 See my earlier comment about moving the GetView()
lfg 2016/11/23 00:27:05 Added the DCHECK and switched to is_active.
CreateRenderWidgetHostViewForRenderManager(render_view_host);
- if (!static_cast<RenderViewHostImpl*>(render_view_host)
- ->CreateRenderView(opener_frame_routing_id,
- proxy_routing_id,
- replicated_frame_state,
- created_with_opener_)) {
+ if (!rvhi->CreateRenderView(opener_frame_routing_id, proxy_routing_id,
+ replicated_frame_state, created_with_opener_)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698