Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Unified Diff: Source/core/loader/DocumentLoader.h

Issue 1357763002: DocumentLoader::isCommittedButEmpty is timing-dependent. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Guess at fixing CQ faliures Created 5 years, 3 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 | « no previous file | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.h
diff --git a/Source/core/loader/DocumentLoader.h b/Source/core/loader/DocumentLoader.h
index 43fd4d53f10bdc57efa5caa7df651072ed759ee2..21f05683586aaec08f05860ce9a2c4f471b7be95 100644
--- a/Source/core/loader/DocumentLoader.h
+++ b/Source/core/loader/DocumentLoader.h
@@ -104,7 +104,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_state == MainResourceDoneButEmpty; }
bool shouldContinueForNavigationPolicy(const ResourceRequest&, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, NavigationPolicy = NavigationPolicyCurrentTab);
NavigationType navigationType() const { return m_navigationType; }
@@ -234,7 +234,8 @@ private:
Provisional,
Committed,
DataReceived,
- MainResourceDone
+ MainResourceDone,
+ MainResourceDoneButEmpty
};
State m_state;
« no previous file with comments | « no previous file | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698