Move ResourceClient to Oilpan heap

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "core/fetch/ImageResource.h"
 
 #include "core/fetch/ImageResourceObserver.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceClient.h"
-#include "core/fetch/ResourceClientOrObserverWalker.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/BitmapImage.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCachePolicy.h"
 #include "wtf/CurrentTime.h"
+#include "wtf/HashCountedSet.h"
 #include "wtf/StdLibExtras.h"
+#include "wtf/Vector.h"
 #include <memory>
 
 namespace blink {
 
-using ImageResourceObserverWalker = ResourceClientOrObserverWalker<ImageResourceObserver, ImageResourceObserver>;
+namespace {
+
+template <typename T>
+Vector<T*> asVector(const HashCountedSet<T*>& set)

[haraken, 2016/08/12 10:45:20]

I'd move this helper function to HashCountedSet.

[yhirano, 2016/08/16 08:57:24]

Done.

+{
+    Vector<T*> vector;
+    copyToVector(set, vector);
+    return vector;
+}
+
+} // namespace
 
 ImageResource* ImageResource::fetch(FetchRequest& request, ResourceFetcher* fetcher)
 {
     if (request.resourceRequest().requestContext() == WebURLRequest::RequestContextUnspecified)
         request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextImage);
     if (fetcher->context().pageDismissalEventBeingDispatched()) {
         KURL requestURL = request.resourceRequest().url();
         if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.getOriginRestriction()))
             fetcher->context().sendImagePing(requestURL);
         return nullptr;
@@ skipping 33 matching lines @@
     Resource::trace(visitor);
     ImageObserver::trace(visitor);
     MultipartImageResourceParser::Client::trace(visitor);
 }
 
 void ImageResource::checkNotify()
 {
     if (isLoading())
         return;
 
-    ImageResourceObserverWalker walker(m_observers);
-    while (auto* observer = walker.next()) {
-        observer->imageNotifyFinished(this);
+    for (auto* observer : asVector(m_observers)) {
+        if (m_observers.contains(observer))
+            observer->imageNotifyFinished(this);
     }
 
     Resource::checkNotify();
 }
 
 void ImageResource::markClientsAndObserversFinished()
 {
     HashCountedSet<ImageResourceObserver*> observers;
     m_observers.swap(observers);
     for (const auto& it : observers)
@@ skipping 60 matching lines @@
     if (nextPriority.visibility == ResourcePriority::NotVisible)
         return;
     priority.visibility = ResourcePriority::Visible;
     priority.intraPriorityValue += nextPriority.intraPriorityValue;
 }
 
 ResourcePriority ImageResource::priorityFromObservers()
 {
     ResourcePriority priority;
 
-    ImageResourceObserverWalker finishedWalker(m_finishedObservers);
-    while (const auto* observer = finishedWalker.next()) {
-        priorityFromObserver(observer, priority);
+    for (auto* observer : asVector(m_finishedObservers)) {
+        if (m_finishedObservers.contains(observer))
+            priorityFromObserver(observer, priority);
     }
-
-    ImageResourceObserverWalker walker(m_observers);
-    while (const auto* observer = walker.next()) {
-        priorityFromObserver(observer, priority);
+    for (auto* observer : asVector(m_observers)) {
+        if (m_observers.contains(observer))
+            priorityFromObserver(observer, priority);
     }
 
     return priority;
 }
 
 bool ImageResource::isSafeToUnlock() const
 {
     // Note that |m_image| holds a reference to |data()| in addition to the one held by the Resource parent class.
     return !m_image || (m_image->hasOneRef() && data()->refCount() == 2);
 }
@@ skipping 126 matching lines @@
     // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
     LayoutSize minimumSize(size.width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
         LayoutUnit(size.height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit()));
     size.scale(multiplier);
     size.clampToMinimumSize(minimumSize);
     return size;
 }
 
 void ImageResource::notifyObservers(const IntRect* changeRect)
 {
-    ImageResourceObserverWalker finishedWalker(m_finishedObservers);
-    while (auto* observer = finishedWalker.next()) {
-        observer->imageChanged(this, changeRect);
+    for (auto* observer : asVector(m_finishedObservers)) {
+        if (m_finishedObservers.contains(observer))
+            observer->imageChanged(this, changeRect);
     }
-
-    ImageResourceObserverWalker walker(m_observers);
-    while (auto* observer = walker.next()) {
-        observer->imageChanged(this, changeRect);
+    for (auto* observer : asVector(m_observers)) {
+        if (m_observers.contains(observer))
+            observer->imageChanged(this, changeRect);
     }
 }
 
 void ImageResource::clear()
 {
     clearImage();
     clearData();
     setEncodedSize(0);
 }
 
@@ skipping 127 matching lines @@
     // to update MemoryCache.
     if (decodedSize() != 0)
         Resource::didAccessDecodedData();
 }
 
 bool ImageResource::shouldPauseAnimation(const blink::Image* image)
 {
     if (!image || image != m_image)
         return false;
 
-    ImageResourceObserverWalker finishedWalker(m_finishedObservers);
-    while (auto* observer = finishedWalker.next()) {
-        if (observer->willRenderImage())
+    for (auto* observer : asVector(m_finishedObservers)) {
+        if (m_finishedObservers.contains(observer) && observer->willRenderImage())
             return false;
     }
 
-    ImageResourceObserverWalker walker(m_observers);
-    while (auto* observer = walker.next()) {
-        if (observer->willRenderImage())
+    for (auto* observer : asVector(m_observers)) {
+        if (m_observers.contains(observer) && observer->willRenderImage())
             return false;
     }
 
     return true;
 }
 
 void ImageResource::animationAdvanced(const blink::Image* image)
 {
     if (!image || image != m_image)
         return;
     notifyObservers();
 }
 
 void ImageResource::updateImageAnimationPolicy()
 {
     if (!m_image)
         return;
 
     ImageAnimationPolicy newPolicy = ImageAnimationPolicyAllowed;
-
-    ImageResourceObserverWalker finishedWalker(m_finishedObservers);
-    while (auto* observer = finishedWalker.next()) {
-        if (observer->getImageAnimationPolicy(newPolicy))
+    for (auto* observer : asVector(m_finishedObservers)) {
+        if (m_finishedObservers.contains(observer) && observer->getImageAnimationPolicy(newPolicy))
+            break;
+    }
+    for (auto* observer : asVector(m_observers)) {
+        if (m_observers.contains(observer) && observer->getImageAnimationPolicy(newPolicy))
             break;
     }
 
-    ImageResourceObserverWalker walker(m_observers);
-    while (auto* observer = walker.next()) {
-        if (observer->getImageAnimationPolicy(newPolicy))
-            break;
-    }
-
     if (m_image->animationPolicy() != newPolicy) {
         m_image->resetAnimation();
         m_image->setAnimationPolicy(newPolicy);
     }
 }
 
 void ImageResource::reloadIfLoFi(ResourceFetcher* fetcher)
 {
     if (resourceRequest().loFiState() != WebURLRequest::LoFiOn)
         return;
@@ skipping 51 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink