| Index: Source/WebCore/loader/MainResourceLoader.cpp
|
| ===================================================================
|
| --- Source/WebCore/loader/MainResourceLoader.cpp (revision 141117)
|
| +++ Source/WebCore/loader/MainResourceLoader.cpp (working copy)
|
| @@ -548,17 +548,11 @@
|
| void MainResourceLoader::notifyFinished(CachedResource* resource)
|
| {
|
| ASSERT_UNUSED(resource, m_resource == resource);
|
| - ASSERT(m_resource);
|
| - if (!m_resource->errorOccurred() && !m_resource->wasCanceled()) {
|
| + if (!m_resource || (!m_resource->errorOccurred() && !m_resource->wasCanceled())) {
|
| didFinishLoading(m_resource->loadFinishTime());
|
| return;
|
| }
|
|
|
| - if (m_documentLoader->request().cachePolicy() == ReturnCacheDataDontLoad && !m_resource->wasCanceled()) {
|
| - frameLoader()->retryAfterFailedCacheOnlyMainResourceLoad();
|
| - return;
|
| - }
|
| -
|
| const ResourceError& error = m_resource->resourceError();
|
| if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForMainError(request(), error))
|
| return;
|
|
|