Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/fetch/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 17 matching lines @@
 #include "core/fetch/Resource.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/IntSizeHash.h"
 #include "platform/geometry/LayoutSize.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/ImageOrientation.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
-class ImageResourceClient;
 class FetchRequest;
-class ResourceFetcher;
 class FloatSize;
+class ImageResourceObserver;
 class Length;
 class MemoryCache;
+class ResourceClient;
+class ResourceFetcher;
 class SecurityOrigin;
 
 class CORE_EXPORT ImageResource final : public Resource, public ImageObserver, public MultipartImageResourceParser::Client {
     friend class MemoryCache;
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageResource);
 public:
-    using ClientType = ImageResourceClient;
+    using ClientType = ResourceClient;
 
     static PassRefPtrWillBeRawPtr<ImageResource> fetch(FetchRequest&, ResourceFetcher*);
 
     static PassRefPtrWillBeRawPtr<ImageResource> create(blink::Image* image)
     {
         return adoptRefWillBeNoop(new ImageResource(image, ResourceLoaderOptions()));
     }
 
     // Exposed for testing
     static PassRefPtrWillBeRawPtr<ImageResource> create(const ResourceRequest& request, blink::Image* image)
@@ skipping 23 matching lines @@
     LayoutSize imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType = IntrinsicSize);
 
     bool isAccessAllowed(SecurityOrigin*);
 
     void updateImageAnimationPolicy();
 
     // If this ImageResource has the Lo-Fi response headers, reload it with
     // the Lo-Fi state set to off and bypassing the cache.
     void reloadIfLoFi(ResourceFetcher*);
 
-    void didAddClient(ResourceClient*) override;
-    void didRemoveClient(ResourceClient*) override;
+    void addObserver(ImageResourceObserver*);
+    void removeObserver(ImageResourceObserver*);
+    bool hasClientsOrObservers() const override { return Resource::hasClientsOrObservers() || !m_observers.isEmpty(); }
 
-    void allClientsRemoved() override;
+    ResourcePriority priorityFromObservers() override;
+
+    void allClientsAndObserversRemoved() override;
 
     void appendData(const char*, size_t) override;
     void error(Resource::Status) override;
     void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
     void finish() override;
 
     // For compatibility, images keep loading even if there are HTTP errors.
     bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
 
     bool isImage() const override { return true; }
@@ skipping 47 matching lines @@
     void clearImage();
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(const IntRect* changeRect = nullptr);
 
     float m_devicePixelRatioHeaderValue;
 
     PersistentWillBeMember<MultipartImageResourceParser> m_multipartParser;
     RefPtr<blink::Image> m_image;
     MultipartParsingState m_multipartParsingState = MultipartParsingState::WaitingForFirstPart;
     bool m_hasDevicePixelRatioHeaderValue;
+    HashCountedSet<ImageResourceObserver*> m_observers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 } // namespace blink
 
 #endif