| 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();
|
| }
|
|
|
|
|