commit a636421d91b362171853d107a8599aa04a910593
author japhet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Nov 01 06:20:00 2012 +0000
committer japhet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Nov 01 06:20:00 2012 +0000
tree 6f04c10d1d2344dc6192e19a99a4b5e2feddea1d
parent 32e3d8139f7522a0529245aeaf272b7896a063c3

Remove some CachedResource::Status's in favor of looking at CachedResource::m_error
https://bugs.webkit.org/show_bug.cgi?id=100901

Reviewed by Adam Barth.

No new tests, refactor only.

* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::buildObjectForFrameTree):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::notifyFinished):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadInSameDocument):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFail):
(WebCore::SubresourceLoader::willCancel):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::stopLoading):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::wasCanceled):
(WebCore::CachedResource::errorOccurred):
(WebCore::CachedResource::loadFailedOrCanceled):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@133130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/loader/DocumentThreadableLoader.cpp

diff --git a/Source/WebCore/loader/DocumentThreadableLoader.cpp b/Source/WebCore/loader/DocumentThreadableLoader.cpp
index ecafe01..88f52f4 100644
--- a/Source/WebCore/loader/DocumentThreadableLoader.cpp
+++ b/Source/WebCore/loader/DocumentThreadableLoader.cpp
@@ -305,14 +305,9 @@
     ASSERT(m_client);
     ASSERT_UNUSED(resource, resource == m_resource);
         
-    if (m_resource && (m_resource->errorOccurred() || m_resource->wasCanceled())) {
-        ResourceError error("Network Request Failed", 0, m_resource->url(), "Resource failed to load");
-        if (m_resource->wasCanceled())
-            error.setIsCancellation(true);
-        if (m_resource->timedOut())
-            error.setIsTimeout(true);
-        didFail(error);
-    } else
+    if (m_resource && m_resource->errorOccurred())
+        didFail(m_resource->resourceError());
+    else
         didFinishLoading(m_resource->identifier(), m_resource->loadFinishTime());
 }