Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681)

1 files changed, 12 insertions, 5 deletions

diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
index 703517bca..b9a1d7e3e 100644
--- a/Source/WebCore/loader/SubresourceLoader.cpp
+++ b/Source/WebCore/loader/SubresourceLoader.cpp
@@ -211,17 +211,24 @@ void SubresourceLoader::didReceiveData(const char* data, int length, long long e
     RefPtr<SubresourceLoader> protect(this);
     ResourceLoader::didReceiveData(data, length, encodedDataLength, allAtOnce);
 
-    if (m_resource->response().httpStatusCode() >= 400 && !m_resource->shouldIgnoreHTTPStatusCodeErrors()) {
-        m_resource->error(CachedResource::LoadError);
-        m_state = Finishing;
-        cancel();
+    if (errorLoadingResource())
         return;
-    }
 
     if (!m_loadingMultipartContent)
         sendDataToResource(data, length);
 }
 
+bool SubresourceLoader::errorLoadingResource()
+{
+    if (m_resource->response().httpStatusCode() < 400 || m_resource->shouldIgnoreHTTPStatusCodeErrors())
+        return false;
+
+    m_resource->error(CachedResource::LoadError);
+    m_state = Finishing;
+    cancel();
+    return true;
+}
+
 void SubresourceLoader::sendDataToResource(const char* data, int length)
 {
     // There are two cases where we might need to create our own SharedBuffer instead of copying the one in ResourceLoader.