Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 78209dbb46d61d801b73d75040e6194dbcb6ba14..276a36960db47d874a52b4aedcbe7908d8277856 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -421,7 +421,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
     // would be dead if MemoryCache holds weak references to Resource).
     // Currently we check references to Resource from ResourceClient and
     // |m_preloads| only, because they are major sources of references.
-    if (resource && !resource->hasClients() && (!m_preloads || !m_preloads->contains(resource)) && !isStaticData) {
+    if (resource && !resource->hasClientsOrObservers() && (!m_preloads || !m_preloads->contains(resource)) && !isStaticData) {
         DEFINE_RESOURCE_HISTOGRAM("Dead.");
     }
 
@@ -447,7 +447,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
         return nullptr;
     }
 
-    if (!resource->hasClients())
+    if (!resource->hasClientsOrObservers())
         m_deadStatsRecorder.update(policy);
 
     if (policy != Use)
@@ -1085,7 +1085,7 @@ void ResourceFetcher::updateAllImageResourcePriorities()
         if (!resource->isImage())
             continue;
 
-        ResourcePriority resourcePriority = resource->priorityFromClients();
+        ResourcePriority resourcePriority = resource->priorityFromObservers();
         ResourceLoadPriority resourceLoadPriority = loadPriority(Resource::Image, FetchRequest(resource->resourceRequest(), FetchInitiatorInfo()), resourcePriority.visibility);
         if (resourceLoadPriority == resource->resourceRequest().priority())
             continue;