third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2174263002: Defer loads in new pages/frames if ScopedPageLoadDeferral is active

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 2174263002: Defer loads in new pages/frames if ScopedPageLoadDeferral is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simplify Created 4 years, 5 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 | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/page/Page.cpp » ('j') | third_party/WebKit/Source/core/page/ScopedPageLoadDeferrer.cpp » ('J')
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 f1aff24f70f0195ec8f20ae6326178d8892c8647..71c83104e397736e7214f911b59faa32001ca352 100644

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

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

@@ -204,6 +204,11 @@ void FrameLoader::init()

m_provisionalDocumentLoader->startLoadingMainResource();

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

m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);

+ // Self-suspend if created in an already deferred Page. Note that both

+ // startLoadingMainResource() and cancelParsing() may have already detached

+ // the frame, since they both fire JS events.

+ if (m_frame->page() && m_frame->page()->defersLoading())

Nate Chapin 2016/07/27 17:30:47 This makes me saddest of all :(

dcheng 2016/07/28 01:23:28 Yes... I would have to completely agree =(

+ setDefersLoading(true);

takeObjectSnapshot();

}