Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/fetch/Resource.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, 2008, 2009, 2010, 2011 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 114 matching lines @@
     const ResourceRequest& lastResourceRequest() const;
 
     void setRevalidatingRequest(const ResourceRequest& request) { m_revalidatingRequest = request; }
 
     const KURL& url() const { return m_resourceRequest.url();}
     Type getType() const { return static_cast<Type>(m_type); }
     const ResourceLoaderOptions& options() const { return m_options; }
     void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
 
     void didChangePriority(ResourceLoadPriority, int intraPriorityValue);
-    ResourcePriority priorityFromClients();
+    virtual ResourcePriority priorityFromObservers() { return ResourcePriority(); }
 
     void addClient(ResourceClient*);
     void removeClient(ResourceClient*);
-    bool hasClients() const { return !m_clients.isEmpty() || !m_clientsAwaitingCallback.isEmpty() || !m_finishedClients.isEmpty(); }
+    virtual bool hasClientsOrObservers() const { return !m_clients.isEmpty() || !m_clientsAwaitingCallback.isEmpty() || !m_finishedClients.isEmpty(); }
 
     enum PreloadResult {
         PreloadNotReferenced,
         PreloadReferenced,
         PreloadReferencedWhileLoading,
         PreloadReferencedWhileComplete
     };
     PreloadResult getPreloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
 
     virtual void didAddClient(ResourceClient*);
-    virtual void didRemoveClient(ResourceClient*) { }
-    virtual void allClientsRemoved();
+
+    // |this| object may be dead after didRemoveClient().

[yhirano, 2016/03/02 01:20:52]

didRemoveClientOrObserver

[hiroshige, 2016/03/12 01:03:36]

Done.

+    void didRemoveClientOrObserver();
+    virtual void allClientsAndObserversRemoved();
 
     unsigned count() const { return m_clients.size(); }
 
     Status getStatus() const { return static_cast<Status>(m_status); }
     void setStatus(Status status) { m_status = status; }
 
     size_t size() const { return encodedSize() + decodedSize() + overheadSize(); }
     size_t encodedSize() const { return m_encodedSize; }
     size_t decodedSize() const { return m_decodedSize; }
     size_t overheadSize() const;
@@ skipping 110 matching lines @@
     virtual void checkNotify();
 
     virtual void destroyDecodedDataForFailedRevalidation() { }
 
     void setEncodedSize(size_t);
     void setDecodedSize(size_t);
     void didAccessDecodedData();
 
     void finishPendingClients();
 
+    void willAddClientOrObserver();
+
     HashCountedSet<ResourceClient*> m_clients;
     HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
     HashCountedSet<ResourceClient*> m_finishedClients;
 
     class ResourceCallback : public NoBaseWillBeGarbageCollectedFinalized<ResourceCallback> {
     public:
         static ResourceCallback* callbackHandler();
         DECLARE_TRACE();
         void schedule(Resource*);
         void cancel(Resource*);
@@ skipping 106 matching lines @@
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName); \
     inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif