Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

Index: third_party/WebKit/Source/core/fetch/ImageResource.h
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.h b/third_party/WebKit/Source/core/fetch/ImageResource.h
index 8baf98c6941a7a27c0017233b7d3eb11e27bd570..0bd9f9b0a96f461828c07e694071a1ea7347f988 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.h
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.h
@@ -35,19 +35,20 @@
 
 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*);
 
@@ -93,10 +94,13 @@ public:
     // 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(); }
+
+    ResourcePriority priorityFromObservers() override;
 
-    void allClientsRemoved() override;
+    void allClientsAndObserversRemoved() override;
 
     void appendData(const char*, size_t) override;
     void error(Resource::Status) override;
@@ -158,6 +162,7 @@ private:
     PersistentWillBeMember<MultipartImageResourceParser> m_multipartParser;
     RefPtr<blink::Image> m_image;
     bool m_hasDevicePixelRatioHeaderValue;
+    HashCountedSet<ImageResourceObserver*> m_observers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);