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

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

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 | « Source/core/loader/DocumentLoader.h ('k') | Source/web/tests/DocumentLoaderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index 3e985b4db5641f6800d4e2b23dea2673abf356dd..d245eabe46fd267cabf0cbb553ce474556f4814e 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -294,7 +294,7 @@ void DocumentLoader::finishedLoading(double finishTime)
if (!m_mainDocumentError.isNull())
return;
- m_state = MainResourceDone;
+ m_state = url() == blankURL() || (m_mainResource && !m_mainResource->encodedSize()) ? MainResourceDoneButEmpty : MainResourceDone;
// If the document specified an application cache manifest, it violates the author's intent if we store it in the memory cache
// and deny the appcache the chance to intercept it in the future, so remove from the memory cache.
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | Source/web/tests/DocumentLoaderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698