Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index fb1f31fe4a687103d510adff2a989b614d419429..8ec8b4ecb727f6e3d051a0e5a257ab7861c17382 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -132,11 +132,12 @@ public:
     void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
 
     void didChangePriority(ResourceLoadPriority, int intraPriorityValue);
-    ResourcePriority priorityFromClients();
+    virtual ResourcePriority priorityFromClients() { return ResourcePriority(); }
 
     void addClient(ResourceClient*);
     void removeClient(ResourceClient*);
-    bool hasClients() const { return !m_clients.isEmpty() || !m_clientsAwaitingCallback.isEmpty() || !m_finishedClients.isEmpty(); }
+    // TODO(hiroshige): ClientsOrObservers
+    virtual bool hasClients() const { return !m_clients.isEmpty() || !m_clientsAwaitingCallback.isEmpty() || !m_finishedClients.isEmpty(); }

[hiroshige, 2016/02/20 02:00:19]

In this CL, hasClients() counts not only ResourceClient but also
ImageResourceOberver in case of ImageResource.
Thus should we change the function name to hasClientsOrObservers() or so?
ditto below.

 
     enum PreloadResult {
         PreloadNotReferenced,
@@ -147,7 +148,11 @@ public:
     PreloadResult preloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
 
     virtual void didAddClient(ResourceClient*);
-    virtual void didRemoveClient(ResourceClient*) { }
+
+    // |this| object may be dead after didRemoveClient().
+    // TODO(hiroshige): ClientOrObserver
+    void didRemoveClient();
+    // TODO(hiroshige): ClientsOrObservers
     virtual void allClientsRemoved();
 
     unsigned count() const { return m_clients.size(); }
@@ -278,6 +283,9 @@ protected:
 
     void finishPendingClients();
 
+    // TODO(hiroshige): ClientsOrObservers
+    void willAddClient();
+
     HashCountedSet<ResourceClient*> m_clients;
     HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
     HashCountedSet<ResourceClient*> m_finishedClients;