third_party/WebKit/Source/core/loader/DocumentLoader.h - Issue 1381003004: Better distinguish didFinishLoad and didStopLoading

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/DocumentLoader.h

Issue 1381003004: Better distinguish didFinishLoad and didStopLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix WebFrameTest.CallbackOrdering race Created 5 years, 2 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

« chrome/browser/extensions/api/web_navigation/web_navigation_api.cc ('K') | « third_party/WebKit/LayoutTests/http/tests/loading/progress-finished-callback-expected.txt ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/DocumentLoader.h

diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.h b/third_party/WebKit/Source/core/loader/DocumentLoader.h

index 43fd4d53f10bdc57efa5caa7df651072ed759ee2..808362c32b5f3456f7aec98140a3870323cc1e23 100644

--- a/third_party/WebKit/Source/core/loader/DocumentLoader.h

+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.h

@@ -106,6 +106,9 @@ public:

bool isCommittedButEmpty() const { return m_state == Committed; }

+ void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }

+ bool sentDidFinishLoad() const { return m_state == SentDidFinishLoad; }

bool shouldContinueForNavigationPolicy(const ResourceRequest&, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy = NavigationPolicyCurrentTab);

NavigationType navigationType() const { return m_navigationType; }

void setNavigationType(NavigationType navigationType) { m_navigationType = navigationType; }

@@ -234,7 +237,8 @@ private:

Provisional,

Committed,

DataReceived,

- MainResourceDone

+ MainResourceDone,

+ SentDidFinishLoad

};

State m_state;