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 cb3e39a1f8f39b31d52a1e5baf656e38cfc1b062..01b2985374a573954d9734b5cebfd7aaeac18ec3 100644 |
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
@@ -292,19 +292,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(); |
} |