Make ImageLoader non-ResourceClient

third_party/WebKit/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 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 162 matching lines @@
 {
     WTF_LOG(Timers, "~ImageLoader %p; m_hasPendingLoadEvent=%d, m_hasPendingErrorEvent=%d",
         this, m_hasPendingLoadEvent, m_hasPendingErrorEvent);
 
 #if !ENABLE(OILPAN)
     if (m_pendingTask)
         m_pendingTask->clearLoader();
 #endif
 
     if (m_image) {
-        m_image->removeClient(this);
         m_image->removeObserver(this);
         m_image = nullptr;
     }
 
 #if !ENABLE(OILPAN)
     ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(this));
     if (m_hasPendingLoadEvent)
         loadEventSender().cancelEvent(this);
 
     ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this));
@@ skipping 26 matching lines @@
         if (m_hasPendingLoadEvent) {
             loadEventSender().cancelEvent(this);
             m_hasPendingLoadEvent = false;
         }
         if (m_hasPendingErrorEvent) {
             errorEventSender().cancelEvent(this);
             m_hasPendingErrorEvent = false;
         }
         m_imageComplete = true;
         if (newImage) {
-            newImage->addClient(this);
             newImage->addObserver(this);
         }
         if (oldImage) {
-            oldImage->removeClient(this);
             oldImage->removeObserver(this);
         }
     }
 
     if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 }
 
 static void configureRequest(FetchRequest& request, ImageLoader::BypassMainWorldBehavior bypassBehavior, Element& element, const ClientHintsPreferences& clientHintsPreferences)
 {
@@ skipping 118 matching lines @@
         if (m_hasPendingErrorEvent && newImage) {
             errorEventSender().cancelEvent(this);
             m_hasPendingErrorEvent = false;
         }
 
         m_image = newImage;
         m_hasPendingLoadEvent = newImage;
         m_imageComplete = !newImage;
 
         updateLayoutObject();
-        // If newImage exists and is cached, addClient() will result in the load event
+        // If newImage exists and is cached, addObserver() will result in the load event
         // being queued to fire. Ensure this happens after beforeload is dispatched.
         if (newImage) {
-            newImage->addClient(this);
             newImage->addObserver(this);
         }
         if (oldImage) {
-            oldImage->removeClient(this);
             oldImage->removeObserver(this);
         }
     }
 
     if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 
     // Only consider updating the protection ref-count of the Element immediately before returning
     // from this function as doing so might result in the destruction of this ImageLoader.
     updatedHasPendingEvent();
@@ skipping 20 matching lines @@
     KURL url = imageSourceToKURL(imageSourceURL);
     if (shouldLoadImmediately(url)) {
         doUpdateFromElement(DoNotBypassMainWorldCSP, updateBehavior, referrerPolicy);
         return;
     }
     // Allow the idiom "img.src=''; img.src='.." to clear down the image before
     // an asynchronous load completes.
     if (imageSourceURL.isEmpty()) {
         ImageResource* image = m_image.get();
         if (image) {
-            image->removeClient(this);
             image->removeObserver(this);
         }
         m_image = nullptr;
     }
 
     // Don't load images for inactive documents. We don't want to slow down the
     // raw HTML parsing case by loading images we don't intend to display.
     Document& document = m_element->document();
     if (document.isActive())
         enqueueImageLoadingMicroTask(updateBehavior, referrerPolicy);
@@ skipping 24 matching lines @@
     // We force any image loads which might require alt content through the asynchronous path so that we can add the shadow DOM
     // for the alt-text content when style recalc is over and DOM mutation is allowed again.
     if (!url.isNull()) {
         Resource* resource = memoryCache()->resourceForURL(url, m_element->document().fetcher()->getCacheIdentifier());
         if (resource && !resource->errorOccurred())
             return true;
     }
     return (m_loadingImageDocument || isHTMLObjectElement(m_element) || isHTMLEmbedElement(m_element) || url.protocolIsData());
 }
 
-void ImageLoader::notifyFinished(Resource* resource)
+void ImageLoader::imageNotifyFinished(ImageResource* resource)
 {
-    WTF_LOG(Timers, "ImageLoader::notifyFinished %p; m_hasPendingLoadEvent=%d",
+    WTF_LOG(Timers, "ImageLoader::imageNotifyFinished %p; m_hasPendingLoadEvent=%d",
         this, m_hasPendingLoadEvent);
 
     ASSERT(m_failedLoadURL.isEmpty());
     ASSERT(resource == m_image.get());
 
     m_imageComplete = true;
 
     // Update ImageAnimationPolicy for m_image.
     if (m_image)
         m_image->updateImageAnimationPolicy();
@@ skipping 157 matching lines @@
 
 void ImageLoader::elementDidMoveToNewDocument()
 {
     if (m_loadDelayCounter)
         m_loadDelayCounter->documentChanged(m_element->document());
     clearFailedLoadURL();
     setImage(0);
 }
 
 } // namespace blink