Source/core/loader/FrameLoader.cpp - Issue 1164883002: Ignore attempts to navigate once a provisional commit has gotten too far along.

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/FrameLoader.cpp

Issue 1164883002: Ignore attempts to navigate once a provisional commit has gotten too far along. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

« no previous file with comments | « LayoutTests/http/tests/navigation/resources/navigate-during-commit.iframe.html ('k') | Source/core/loader/NavigationScheduler.h » ('j') | Source/core/loader/NavigationScheduler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameLoader.cpp

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

index 322c727da28137eb911e32068358b681a1c5c247..207a837f3849e355b68f3eb01a3a8d10a3ee6d02 100644

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

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

@@ -972,8 +972,10 @@ void FrameLoader::commitProvisionalLoad()

// we need to abandon the current load.

if (pdl != m_provisionalDocumentLoader)

return;

- if (m_documentLoader)

+ if (m_documentLoader) {

+ FrameNavigationDisabler navigationDisabler(m_frame);

m_documentLoader->detachFromFrame();

+ }

// detachFromFrame() will abort XHRs that haven't completed, which can

// trigger event listeners for 'abort'. These event listeners might detach

// the frame.

@@ -1175,7 +1177,7 @@ bool FrameLoader::shouldClose()

bool shouldClose = false;

{

- NavigationDisablerForBeforeUnload navigationDisabler;

+ NavigationDisabler navigationDisabler;

size_t i;

bool didAllowNavigation = false;