[WIP] ImageResourceClient->ImageResourceObserver

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 2ca6294e640d583858c9ee3c707e2474699ee367..86b82f862a4b62ad4e9f344bf0ae9274fddd8e72 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.h
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.h
@@ -34,19 +34,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 {
     friend class MemoryCache;
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageResource);
 public:
-    using ClientType = ImageResourceClient;
+    using ClientType = ResourceClient;
 
     static PassRefPtrWillBeRawPtr<ImageResource> fetch(FetchRequest&, ResourceFetcher*);
 
@@ -97,8 +98,10 @@ 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*);
+
+    ResourcePriority priorityFromClients() override;
 
     void allClientsRemoved() override;
 
@@ -158,6 +161,7 @@ private:
 
     RefPtr<blink::Image> m_image;
     bool m_hasDevicePixelRatioHeaderValue;
+    HashCountedSet<ImageResourceObserver*> m_observers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);