Phase III Step 1: Make ImageResourceContent manage its own ResourceStatus

third_party/WebKit/Source/core/loader/resource/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 61 matching lines @@
   const KURL& url() const override { return m_resource->url(); }
   bool hasDevicePixelRatioHeaderValue() const override {
     return m_resource->m_hasDevicePixelRatioHeaderValue;
   }
   float devicePixelRatioHeaderValue() const override {
     return m_resource->m_devicePixelRatioHeaderValue;
   }
   const ResourceResponse& response() const override {
     return m_resource->response();
   }
-  ResourceStatus getStatus() const override { return m_resource->getStatus(); }
   bool shouldShowPlaceholder() const override {
     return m_resource->shouldShowPlaceholder();
   }
   bool isCacheValidator() const override {
     return m_resource->isCacheValidator();
   }
   bool isAccessAllowed(
       SecurityOrigin* securityOrigin,
       DoesCurrentFrameHaveSingleSecurityOrigin
           doesCurrentFrameHasSingleSecurityOrigin) const override {
@@ skipping 234 matching lines @@
   if (loader())
     loader()->reloadIfLoFiOrPlaceholderImage(this);
 
   // Finishes loading if needed, and notifies observers.
   if (!allDataReceived && loader()) {
     // Observers are notified via ImageResource::finish().
     // TODO(hiroshige): Do not call didFinishLoading() directly.
     loader()->didFinishLoading(monotonicallyIncreasingTime(), size, size);
   } else if (getContent()) {
     auto result = getContent()->updateImage(
-        nullptr, ImageResourceContent::ClearImageAndNotifyObservers,
-        allDataReceived);
+        nullptr, getStatus(),
+        ImageResourceContent::ClearImageAndNotifyObservers, allDataReceived);
     DCHECK_EQ(result, ImageResourceContent::UpdateImageResult::NoDecodeError);
   }
 
   memoryCache()->remove(this);
 }
 
 void ImageResource::updateImageAndClearBuffer() {
   updateImage(data(), ImageResourceContent::ClearAndUpdateImage, true);
   clearData();
 }
 
+void ImageResource::notifyStartLoad() {
+  if (!getContent())
+    return;
+  CHECK_EQ(getStatus(), ResourceStatus::Pending);
+  getContent()->notifyStartLoad();
+}
+
 void ImageResource::finish(double loadFinishTime) {
   if (m_multipartParser) {
     m_multipartParser->finish();
     if (data())
       updateImageAndClearBuffer();
   } else {
     updateImage(data(), ImageResourceContent::UpdateImage, true);
     // As encoded image data can be created from m_image  (see
     // ImageResource::resourceBuffer(), we don't have to keep m_data. Let's
     // clear this. As for the lifetimes of m_image and m_data, see this
@@ skipping 224 matching lines @@
     return ResourcePriority();
   return getContent()->priorityFromObservers();
 }
 
 void ImageResource::updateImage(
     PassRefPtr<SharedBuffer> sharedBuffer,
     ImageResourceContent::UpdateImageOption updateImageOption,
     bool allDataReceived) {
   if (!getContent())
     return;
-  auto result = getContent()->updateImage(std::move(sharedBuffer),
+  auto result = getContent()->updateImage(std::move(sharedBuffer), getStatus(),
                                           updateImageOption, allDataReceived);
   if (result == ImageResourceContent::UpdateImageResult::ShouldDecodeError) {
     // TODO before commit (hiroshige): Update the comment.
     // In case of decode error, we call imageNotifyFinished() iff we don't
     // initiate reloading:
     // [(a): when this is in the middle of loading, or (b): otherwise]
     // 1. The updateImage() call above doesn't call notifyObservers().
     // 2. notifyObservers(ShouldNotifyFinish) is called
     //    (a) via updateImage() called in ImageResource::finish()
     //        called via didFinishLoading() called in decodeError(), or
     //    (b) via updateImage() called in decodeError().
     //    imageNotifyFinished() is called here iff we will not initiate
     //    reloading in Step 3 due to notifyObservers()'s
     //    schedulingReloadOrShouldReloadBrokenPlaceholder() check.
     // 3. reloadIfLoFiOrPlaceholderImage() is called via ResourceFetcher
     //    (a) via didFinishLoading() called in decodeError(), or
     //    (b) after returning ImageResource::updateImage().
     decodeError(allDataReceived);
   }
 }
 
 }  // namespace blink