Phase III Step 1: Make ImageResourceContent manage its own ResourceStatus

third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ImageResourceContent_h
 #define ImageResourceContent_h
 
 #include "core/CoreExport.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/IntSizeHash.h"
@@ skipping 73 matching lines @@
 
   void addObserver(ImageResourceObserver*);
   void removeObserver(ImageResourceObserver*);
 
   bool isSizeAvailable() const {
     return m_sizeAvailable == Image::SizeAvailable;
   }
 
   DECLARE_TRACE();
 
+  // ResourceStatus and deriving predicates.
+  // ImageResourceContent::getStatus() can be different from
+  // ImageResource::getStatus(). Use ImageResourceContent::getStatus().
+  ResourceStatus getStatus() const;
+  bool isLoaded() const;
+  bool isLoading() const;
+  bool errorOccurred() const;
+  bool loadFailedOrCanceled() const;
+
   // Redirecting methods to Resource.
   const KURL& url() const;
   bool isAccessAllowed(SecurityOrigin*);
   const ResourceResponse& response() const;
-  bool isLoaded() const;
-  bool isLoading() const;
-  bool errorOccurred() const;
-  bool loadFailedOrCanceled() const;
-  ResourceStatus getStatus() const;
   const ResourceError& resourceError() const;
 
   // For FrameSerializer.
   bool hasCacheControlNoStoreHeader() const;
 
   void emulateLoadStartedForInspector(ResourceFetcher*,
                                       const KURL&,
                                       const AtomicString& initiatorName);
 
   void setNotRefetchableDataFromDiskCache() {
@@ skipping 20 matching lines @@
     ClearImageAndNotifyObservers,
   };
   enum class UpdateImageResult {
     NoDecodeError,
 
     // Decode error occurred. Observers are not notified.
     // Only occurs when UpdateImage or ClearAndUpdateImage is specified.
     ShouldDecodeError,
   };
   WARN_UNUSED_RESULT UpdateImageResult updateImage(PassRefPtr<SharedBuffer>,
+                                                   ResourceStatus,
                                                    UpdateImageOption,
                                                    bool allDataReceived);
 
+  void notifyStartLoad();
   void destroyDecodedData();
   void doResetAnimation();
 
   void setImageResourceInfo(ImageResourceInfo*);
 
   ResourcePriority priorityFromObservers() const;
   PassRefPtr<const SharedBuffer> resourceBuffer() const;
   bool shouldUpdateImageImmediately() const;
   bool hasObservers() const {
     return !m_observers.isEmpty() || !m_finishedObservers.isEmpty();
@@ skipping 12 matching lines @@
   void changedInRect(const blink::Image*, const IntRect&) override;
 
   PassRefPtr<Image> createImage();
   void clearImage();
 
   enum NotifyFinishOption { ShouldNotifyFinish, DoNotNotifyFinish };
 
   // If not null, changeRect is the changed part of the image.
   void notifyObservers(NotifyFinishOption, const IntRect* changeRect = nullptr);
   void markObserverFinished(ImageResourceObserver*);
+  void updateStatus(ResourceStatus, NotifyFinishOption);
 
   Member<ImageResourceInfo> m_info;
+  ResourceStatus m_status = ResourceStatus::NotStarted;
 
   RefPtr<blink::Image> m_image;
 
   HashCountedSet<ImageResourceObserver*> m_observers;
   HashCountedSet<ImageResourceObserver*> m_finishedObservers;
 
   Image::SizeAvailability m_sizeAvailable = Image::SizeUnavailable;
 
   // Indicates if this resource's encoded image data can be purged and refetched
   // from disk cache to save memory usage. See crbug/664437.
   bool m_isRefetchableDataFromDiskCache;
 
 #if DCHECK_IS_ON()
   bool m_isUpdateImageBeingCalled = false;
 #endif
 };
 
 }  // namespace blink
 
 #endif