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>;
+struct ImageResourceObserverWalker {

[haraken, 2016/08/02 04:18:06]

Shall we add a TODO to replace this with ResourceClientWalker?

Also as I commented below, I think we can just remove the walkers if we have
copyToVector(HashCountedSet<>). Then the caller site can just copyToVector the
hash counted set and iterate the vector.

[yhirano, 2016/08/03 10:40:28]

Thanks, done.

+    STACK_ALLOCATED();
+public:
+    explicit ImageResourceObserverWalker(const HashCountedSet<ImageResourceObserver*>& set)
+        : m_observerSet(set)
+    {
+        m_observerVector.reserveCapacity(set.size());
+        for (const auto& keyvalue : set)
+            m_observerVector.append(keyvalue.key);
+    }
+
+    ImageResourceObserver* next()
+    {
+        size_t size = m_observerVector.size();
+        while (m_index < size) {
+            auto* next = m_observerVector[m_index++];
+            if (m_observerSet.contains(next))
+                return next;
+        }
+        return nullptr;
+    }
+
+private:
+    const HashCountedSet<ImageResourceObserver*>& m_observerSet;
+    Vector<ImageResourceObserver*> m_observerVector;
+    size_t m_index = 0;
+};
 
 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 537 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