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

Unified Diff: Source/WebCore/loader/MainResourceLoader.cpp

Issue 12090050: Revert 138962 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1397/
Patch Set: Created 7 years, 11 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/WebCore/loader/FrameLoader.cpp ('k') | Source/WebCore/platform/network/ResourceHandle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « Source/WebCore/loader/FrameLoader.cpp ('k') | Source/WebCore/platform/network/ResourceHandle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698