Oilpan: simplify ImageLoaderClient handling.

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 149 matching lines @@
 }
 
 void ImageLoader::dispose()
 {
     WTF_LOG(Timers, "~ImageLoader %p; m_hasPendingLoadEvent=%d, m_hasPendingErrorEvent=%d",
         this, m_hasPendingLoadEvent, m_hasPendingErrorEvent);
 
     if (m_pendingTask)
         m_pendingTask->clearLoader();
 
+#if ENABLE(OILPAN)
+    for (const auto& client : m_clients)
+        willRemoveClient(*client);
+#endif
+
     if (m_image)
         m_image->removeClient(this);
 
     ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(this));
     if (m_hasPendingLoadEvent)
         loadEventSender().cancelEvent(this);
 
     ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this));
     if (m_hasPendingErrorEvent)
         errorEventSender().cancelEvent(this);
 }
 
+#if ENABLE(OILPAN)
+void ImageLoader::clearWeakMembers(Visitor* visitor)
+{
+    Vector<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_element);
+#if ENABLE(OILPAN)
+    visitor->template registerWeakMembers<ImageLoader, &ImageLoader::clearWeakMembers>(this);
+#endif
 }
 
 void ImageLoader::setImage(ImageResource* newImage)
 {
     setImageWithoutConsideringPendingLoadEvent(newImage);
 
     // 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 391 matching lines @@
     // from this function as doing so might result in the destruction of this ImageLoader.
     updatedHasPendingEvent();
 }
 
 void ImageLoader::addClient(ImageLoaderClient* client)
 {
     if (client->requestsHighLiveResourceCachePriority()) {
         if (m_image && !m_highPriorityClientCount++)
             memoryCache()->updateDecodedResource(m_image.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityHigh);
     }
-#if ENABLE(OILPAN)
-    m_clients.add(client, adoptPtr(new ImageLoaderClientRemover(*this, *client)));
-#else
     m_clients.add(client);
-#endif
 }
 
 void ImageLoader::willRemoveClient(ImageLoaderClient& client)
 {
     if (client.requestsHighLiveResourceCachePriority()) {
         ASSERT(m_highPriorityClientCount);
         m_highPriorityClientCount--;
         if (m_image && !m_highPriorityClientCount)
             memoryCache()->updateDecodedResource(m_image.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityLow);
     }
@@ skipping 27 matching lines @@
 void ImageLoader::elementDidMoveToNewDocument()
 {
     if (m_loadDelayCounter)
         m_loadDelayCounter->documentChanged(m_element->document());
     clearFailedLoadURL();
     setImage(0);
 }
 
 void ImageLoader::sourceImageChanged()
 {
-#if ENABLE(OILPAN)
-    for (auto& client : m_clients)
-        client.key->notifyImageSourceChanged();
-#else
     for (auto& client : m_clients) {
         ImageLoaderClient* handle = client;
         handle->notifyImageSourceChanged();
     }
-#endif
 }
 
-#if ENABLE(OILPAN)
-ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover()
-{
-    m_loader.willRemoveClient(m_client);
-}
-#endif
-}
+} // namespace blink