third_party/WebKit/Source/core/loader/DocumentLoader.h - Issue 1364863002: DocumentLoader::isCommittedButEmpty is timing-dependent.

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 1364863002: DocumentLoader::isCommittedButEmpty is timing-dependent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Back to the original test fix 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

« android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java ('K') | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java ('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 a8b42166f3bd5ac40de224ee472283b932e10ed0..f4451ca0ace3a9730c2ccf4d2c6ae9a2b85961b8 100644

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

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

@@ -105,7 +105,7 @@ public:

bool replacesCurrentHistoryItem() const { return m_replacesCurrentHistoryItem; }

void setReplacesCurrentHistoryItem(bool replacesCurrentHistoryItem) { m_replacesCurrentHistoryItem = replacesCurrentHistoryItem; }

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

+ bool isCommittedButEmpty() const { return m_state >= Committed && !m_dataReceived; }

void setSentDidFinishLoad() { m_state = SentDidFinishLoad; }

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

@@ -209,6 +209,7 @@ private:

bool m_isClientRedirect;

bool m_replacesCurrentHistoryItem;

+ bool m_dataReceived;

NavigationType m_navigationType;

@@ -228,7 +229,6 @@ private:

NotStarted,

Provisional,

Committed,

- DataReceived,

MainResourceDone,

SentDidFinishLoad

};