Source/core/loader/DocumentLoader.cpp - Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/loader/DocumentLoader.cpp

Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 9 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:

Index: Source/core/loader/DocumentLoader.cpp

diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp

index 582a680aeed6a3c3674f24197236559a20aa8f50..ee5bdd90d001dbed3d1e44d18044f7af617312e7 100644

--- a/Source/core/loader/DocumentLoader.cpp

+++ b/Source/core/loader/DocumentLoader.cpp

@@ -748,8 +748,8 @@

{

LocalFrame* frame = init.frame();

- ASSERT(!frame->document() || !frame->document()->isActive());

- ASSERT(frame->tree().childCount() == 0);

+ if (frame->document())

+ frame->document()->prepareForDestruction();

if (!init.shouldReuseDefaultView())

frame->setDOMWindow(LocalDOMWindow::create(*frame));

« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »