Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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 124 matching lines @@
     RawPtrWillBeWeakPersistent<ImageLoader> m_loader;
     BypassMainWorldBehavior m_shouldBypassMainWorldCSP;
     UpdateFromElementBehavior m_updateBehavior;
     RefPtr<ScriptState> m_scriptState;
     WeakPtrFactory<Task> m_weakFactory;
     ReferrerPolicy m_referrerPolicy;
 };
 
 ImageLoader::ImageLoader(Element* element)
     : m_element(element)
-    , m_image(0)
     , m_derefElementTimer(this, &ImageLoader::timerFired)
     , m_hasPendingLoadEvent(false)
     , m_hasPendingErrorEvent(false)
     , m_imageComplete(true)
     , m_loadingImageDocument(false)
     , m_elementIsProtected(false)
     , m_suppressErrorEvents(false)
     , m_highPriorityClientCount(0)
 {
     WTF_LOG(Timers, "new ImageLoader %p", this);
@@ skipping 17 matching lines @@
 #if !ENABLE(OILPAN)
     if (m_pendingTask)
         m_pendingTask->clearLoader();
 #endif
 
 #if ENABLE(OILPAN)
     for (const auto& client : m_clients)
         willRemoveClient(*client);
 #endif
 
-    if (m_image)
+    if (m_image) {
         m_image->removeClient(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));
     if (m_hasPendingErrorEvent)
         errorEventSender().cancelEvent(this);
 #endif
 }
 
 #if ENABLE(OILPAN)
 void ImageLoader::clearWeakMembers(Visitor* visitor)
 {
     Vector<UntracedMember<ImageLoaderClient>> deadClients;
     for (const auto& client : m_clients) {
         if (!Heap::isHeapObjectAlive(client)) {
             willRemoveClient(*client);
             deadClients.append(client);
         }
     }
     for (unsigned i = 0; i < deadClients.size(); ++i)
         m_clients.remove(deadClients[i]);
 }
 #endif
 
 DEFINE_TRACE(ImageLoader)
 {
+    visitor->trace(m_image);
     visitor->trace(m_element);
 #if ENABLE(OILPAN)
     visitor->template registerWeakMembers<ImageLoader, &ImageLoader::clearWeakMembers>(this);
 #endif
 }
 
 void ImageLoader::setImage(ImageResource* newImage)
 {
     setImageWithoutConsideringPendingLoadEvent(newImage);
 
@@ skipping 79 matching lines @@
     // Make sure to only decrement the count when we exit this function
     OwnPtr<IncrementLoadEventDelayCount> loadDelayCounter;
     loadDelayCounter.swap(m_loadDelayCounter);
 
     Document& document = m_element->document();
     if (!document.isActive())
         return;
 
     AtomicString imageSourceURL = m_element->imageSourceURL();
     KURL url = imageSourceToKURL(imageSourceURL);
-    ResourcePtr<ImageResource> newImage = 0;
+    RefPtrWillBeRawPtr<ImageResource> newImage = nullptr;
     RefPtrWillBeRawPtr<Element> protectElement(m_element.get());
     if (!url.isNull()) {
         // Unlike raw <img>, we block mixed content inside of <picture> or <img srcset>.
         ResourceLoaderOptions resourceLoaderOptions = ResourceFetcher::defaultResourceOptions();
         ResourceRequest resourceRequest(url);
         resourceRequest.setFetchCredentialsMode(WebURLRequest::FetchCredentialsModeSameOrigin);
         if (updateBehavior == UpdateForcedReload) {
             resourceRequest.setCachePolicy(ResourceRequestCachePolicy::ReloadBypassingCache);
             resourceRequest.setLoFiState(WebURLRequest::LoFiOff);
             // ImageLoader defers the load of images when in an ImageDocument.
@@ skipping 29 matching lines @@
             clearFailedLoadURL();
         }
     } else {
         if (!imageSourceURL.isNull()) {
             // Fire an error event if the url string is not empty, but the KURL is.
             dispatchErrorEvent();
         }
         noImageResourceToLoad();
     }
 
-    ImageResource* oldImage = m_image.get();
+    RefPtrWillBeRawPtr<ImageResource> oldImage = m_image.get();
     if (updateBehavior == UpdateSizeChanged && m_element->layoutObject() && m_element->layoutObject()->isImage() && newImage == oldImage) {
         toLayoutImage(m_element->layoutObject())->intrinsicSizeChanged();
     } else {
         if (newImage != oldImage)
             sourceImageChanged();
 
         if (m_hasPendingLoadEvent) {
             loadEventSender().cancelEvent(this);
             m_hasPendingLoadEvent = false;
         }
@@ skipping 306 matching lines @@
 
 void ImageLoader::sourceImageChanged()
 {
     for (auto& client : m_clients) {
         ImageLoaderClient* handle = client;
         handle->notifyImageSourceChanged();
     }
 }
 
 } // namespace blink