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

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

Issue 799593004: Don't crash while detaching a pending child frame under --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self-review fixes Created 6 years 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_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 06ab825123e4b1fd294dd577e6aee18ab9ff94fe..b5246f88a69b3ddf0e2a0613587c01cb6c79fc50 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -66,8 +66,10 @@ RenderFrameHostManager::RenderFrameHostManager(
}
RenderFrameHostManager::~RenderFrameHostManager() {
- if (pending_render_frame_host_)
- CancelPending();
+ if (pending_render_frame_host_) {
+ pending_render_frame_host_->GetProcess()->RemovePendingView();
nasko 2014/12/11 23:49:53 Don't we need the RenderViewDevToolsAgentHost::OnC
ncarter (slow) 2014/12/12 20:21:06 I thought about this. OnCancelPendingNavigation wo
ncarter (slow) 2014/12/12 20:22:41 Whoops -- I published the wrong comment. Meant to
+ pending_render_frame_host_.reset();
nasko 2014/12/11 23:49:54 Does this need to be explicitly reset? If yes, it
ncarter (slow) 2014/12/12 20:21:06 I just wanted to preserve the existing relative de
+ }
// We should always have a current RenderFrameHost except in some tests.
SetRenderFrameHost(scoped_ptr<RenderFrameHostImpl>());

Powered by Google App Engine
This is Rietveld 408576698