third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 1659013003: Don't reset LoadEventProgress if frame unload has already started.

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: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 1659013003: Don't reset LoadEventProgress if frame unload has already started. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test and adjust comments. Created 4 years, 11 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

« third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h ('K') | « third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index 27cc4b93872c298865140447341d021f73a9bb7a..d0cf70621827a6b694e5ad0cf07c71f86e0df79d 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -1042,6 +1042,10 @@ bool FrameLoader::prepareForCommit()

ThreadState::current()->schedulePageNavigationGCIfNeeded(ratio);

}

+ // Don't allow any new child frames to load in this frame: attaching a new

+ // child frame during or after detaching children results in an attached

+ // frame on a detached DOM tree, which is bad.

+ SubframeLoadingDisabler disabler(m_frame->document());

if (m_documentLoader) {

client()->dispatchWillClose();

dispatchUnloadEvent();