Phase II Step 3: Reload LoFi/placeholder images via new ImageResource

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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
     version 2 of the License, or (at your option) any later version.
@@ skipping 52 matching lines @@
   static ImageResource* fetch(FetchRequest&, ResourceFetcher*);
 
   // TODO(hiroshige): Make create() test-only by refactoring ImageDocument.
   static ImageResource* create(const ResourceRequest&);
 
   ~ImageResource() override;
 
   ImageResourceContent* getContent();
   const ImageResourceContent* getContent() const;
 
-  void reloadIfLoFiOrPlaceholderImage(ResourceFetcher*,
-                                      ReloadLoFiOrPlaceholderPolicy);
+  ImageResource* reloadIfLoFiOrPlaceholderImage(
+      ResourceFetcher*,
+      ReloadLoFiOrPlaceholderPolicy) override;
 
   void didAddClient(ResourceClient*) override;
 
   ResourcePriority priorityFromObservers() override;
 
   void allClientsAndObserversRemoved() override;
 
   PassRefPtr<const SharedBuffer> resourceBuffer() const override;
   void appendData(const char*, size_t) override;
-  void error(const ResourceError&) override;
+  void error(const ResourceError&, ResourceFetcher* fetcherForReload) override;
   void responseReceived(const ResourceResponse&,
                         std::unique_ptr<WebDataConsumerHandle>) override;
-  void finish(double finishTime = 0.0) override;
+  void finish(double finishTime = 0.0,
+              ResourceFetcher* fetcherForReload = nullptr) override;
 
   // For compatibility, images keep loading even if there are HTTP errors.
   bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
 
   bool isImage() const override { return true; }
 
   // MultipartImageResourceParser::Client
   void onePartInMultipartReceived(const ResourceResponse&) final;
   void multipartDataReceived(const char*, size_t) final;
 
@@ skipping 20 matching lines @@
   // Only for ImageResourceInfoImpl.
   void decodeError(bool allDataReceived);
   bool isAccessAllowed(
       SecurityOrigin*,
       ImageResourceInfo::DoesCurrentFrameHaveSingleSecurityOrigin) const;
 
   bool hasClientsOrObservers() const override;
 
   void updateImageAndClearBuffer();
 
-  void checkNotify() override;
-
   void destroyDecodedDataIfPossible() override;
   void destroyDecodedDataForFailedRevalidation() override;
 
   // When UpdateImageOption is UpdateImage but this is the first
   // updateImage() call, then ClearAndUpdateImage is used instead to enforce
   // new image creation.
   void updateImage(PassRefPtr<SharedBuffer>,
                    ImageResourceContent::UpdateImageOption,
-                   bool allDataReceived);
+                   bool allDataReceived,
+                   ResourceFetcher* fetcherForReload = nullptr);
   void flushImageIfNeeded(TimerBase*);
 
   bool shouldReloadBrokenPlaceholder() const {
     return m_isPlaceholder && willPaintBrokenImage();
   }
 
   bool willPaintBrokenImage() const;
 
+  void detachContent();
+
   Member<ImageResourceContent> m_content;
 
   // Indicates whether updateImage() is called for this resource, or for this
   // part (in case of multipart images), and is used for enforcing creation of
   // new blink::Image in ImageResourceContent for the first updateImage().
   bool m_isUpdateImageCalled = false;
 
   // TODO(hiroshige): move |m_devicePixelRatioHeaderValue| and
   // |m_hasDevicePixelRatioHeaderValue| to ImageResourceContent and update
   // it via ImageResourceContent::updateImage().
   float m_devicePixelRatioHeaderValue;
 
   Member<MultipartImageResourceParser> m_multipartParser;
   MultipartParsingState m_multipartParsingState =
       MultipartParsingState::WaitingForFirstPart;
   bool m_hasDevicePixelRatioHeaderValue;
 
-  // Indicates if the ImageResource is currently scheduling a reload, e.g.
-  // because reloadIfLoFi() was called.
-  bool m_isSchedulingReload;
-
   // Indicates if this ImageResource is either attempting to load a placeholder
   // image, or is a (possibly broken) placeholder image.
   bool m_isPlaceholder;
 
   Timer<ImageResource> m_flushTimer;
   double m_lastFlushTime = 0.;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }  // namespace blink
 
 #endif