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

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

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
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index ee3a2fc1c211c1dea5a8419646de66dcb93ce90a..1c7a7e851a745a39f76a6418848961a063450ae6 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -291,19 +291,10 @@ void DocumentLoader::finishedLoading(double finishTime)
commitData(0, 0);
}
- endWriting(m_writer.get());
-
- if (!m_mainDocumentError.isNull())
- return;
- m_state = 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.
- if (m_frame) {
- if (m_mainResource && m_frame->document()->hasAppCacheManifest())
- memoryCache()->remove(m_mainResource.get());
- }
m_applicationCacheHost->finishedLoadingMainResource();
+ endWriting(m_writer.get());
+ if (m_state < MainResourceDone)
+ m_state = MainResourceDone;
clearMainResourceHandle();
}

Powered by Google App Engine
This is Rietveld 408576698