third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2006033002: Disable frame navigations during DocumentLoader detach in FrameLoader::startLoad

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 2006033002: Disable frame navigations during DocumentLoader detach in FrameLoader::startLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: -Wild idea, +test Created 4 years, 7 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/LayoutTests/http/tests/navigation/start-load-during-provisional-loader-detach.html ('K') | « third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp ('k') | no next file » | 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 da7e510ebd2a3daab476a994525e08db3564450d..36dc8cd6cb2576e8d06c3ba25eba95f5786d993e 100644

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

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

@@ -1419,7 +1419,10 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty

return;

m_frame->document()->cancelParsing();

- detachDocumentLoader(m_provisionalDocumentLoader);

+ if (m_provisionalDocumentLoader) {

+ FrameNavigationDisabler navigationDisabler(*m_frame);

+ detachDocumentLoader(m_provisionalDocumentLoader);

+ }

// beforeunload fired above, and detaching a DocumentLoader can fire

// events, which can detach this frame.