Revert 138962

Source/WebCore/loader/MainResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 530 matching lines @@
 
     documentLoader()->timing()->setResponseEnd(finishTime ? finishTime : (m_timeOfLastDataReceived ? m_timeOfLastDataReceived : monotonicallyIncreasingTime()));
     documentLoader()->finishedLoading();
 
     dl->applicationCacheHost()->finishedLoadingMainResource();
 }
 
 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;
 
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
 #if !USE(CF)
     ASSERT(!defersLoading());
 #endif
     
@@ skipping 123 matching lines @@
 {
     ASSERT(!m_substituteDataLoadIdentifier || !loader() || !loader()->identifier());
     if (m_substituteDataLoadIdentifier)
         return m_substituteDataLoadIdentifier;
     if (ResourceLoader* resourceLoader = loader())
         return resourceLoader->identifier();
     return 0;
 }
 
 }