Unify Resource loading status tracking

third_party/WebKit/Source/core/fetch/ImageResource.cpp

Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
index 499d584331131aa9e640f061471a48b5c3385756..bb21c47a46b25142d2a76d85003438915d7c7199 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -52,9 +52,6 @@ PassRefPtrWillBeRawPtr<ImageResource> ImageResource::fetch(FetchRequest& request
         return nullptr;
     }
 
-    if (fetcher->clientDefersImage(request.resourceRequest().url()))
-        request.setDefer(FetchRequest::DeferredByClient);
-
     return toImageResource(fetcher->requestResource(request, ImageResourceFactory()));
 }
 
@@ -65,7 +62,6 @@ ImageResource::ImageResource(const ResourceRequest& resourceRequest, const Resou
     , m_hasDevicePixelRatioHeaderValue(false)
 {
     WTF_LOG(Timers, "new ImageResource(ResourceRequest) %p", this);
-    setStatus(Unknown);
     setCustomAcceptHeader();
 }
 
@@ -77,7 +73,6 @@ ImageResource::ImageResource(blink::Image* image, const ResourceLoaderOptions& o
 {
     WTF_LOG(Timers, "new ImageResource(Image) %p", this);
     setStatus(Cached);
-    setLoading(false);
     setCustomAcceptHeader();
 }
 
@@ -87,7 +82,6 @@ ImageResource::ImageResource(const ResourceRequest& resourceRequest, blink::Imag
 {
     WTF_LOG(Timers, "new ImageResource(ResourceRequest, Image) %p", this);
     setStatus(Cached);
-    setLoading(false);
     setCustomAcceptHeader();
 }
 
@@ -105,15 +99,6 @@ DEFINE_TRACE(ImageResource)
     MultipartImageResourceParser::Client::trace(visitor);
 }
 
-void ImageResource::load(ResourceFetcher* fetcher)
-{
-    ASSERT(fetcher);
-    if (fetcher->autoLoadImages())
-        Resource::load(fetcher);
-    else
-        setLoading(false);
-}
-
 void ImageResource::didAddClient(ResourceClient* c)
 {
     if (m_data && !m_image && !errorOccurred()) {
@@ -483,7 +468,8 @@ void ImageResource::onePartInMultipartReceived(const ResourceResponse& response)
     if (m_multipartParsingState == MultipartParsingState::ParsingFirstPart) {
         m_multipartParsingState = MultipartParsingState::FinishedParsingFirstPart;
         // Notify finished when the first part ends.
-        setLoading(false);
+        if (!errorOccurred())
+            setStatus(Cached);
         checkNotify();
         if (m_loader)
             m_loader->didFinishLoadingOnePart(0, WebURLLoaderClient::kUnknownEncodedDataLength);