Stop ResourceCallback from being an on-heap class

third_party/WebKit/Source/core/fetch/Resource.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, 2008, 2009, 2010, 2011 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
@@ skipping 208 matching lines @@
         return;
 
     if (m_cachedMetadata) {
         const Vector<char>& serializedData = m_cachedMetadata->serialize();
         Platform::current()->cacheMetadataInCacheStorage(response().url(), response().responseTime(), serializedData.data(), serializedData.size(), WebSecurityOrigin(m_securityOrigin), response().cacheStorageCacheName());
     } else {
         Platform::current()->cacheMetadataInCacheStorage(response().url(), response().responseTime(), nullptr, 0, WebSecurityOrigin(m_securityOrigin), response().cacheStorageCacheName());
     }
 }
 
-class Resource::ResourceCallback final : public GarbageCollectedFinalized<ResourceCallback> {
+// This class cannot be on-heap because the first callbackHandler() call
+// instantiates the singleton object while we can call it in the
+// pre-finalization step.
+class Resource::ResourceCallback final {
 public:
     static ResourceCallback& callbackHandler();
-    DECLARE_TRACE();
     void schedule(Resource*);
     void cancel(Resource*);
     bool isScheduled(Resource*) const;
 private:
     ResourceCallback();
 
     void runTask();
     std::unique_ptr<CancellableTaskFactory> m_callbackTaskFactory;
-    HeapHashSet<Member<Resource>> m_resourcesWithPendingClients;
+    HashSet<Persistent<Resource>> m_resourcesWithPendingClients;
 };
 
 Resource::ResourceCallback& Resource::ResourceCallback::callbackHandler()
 {
     // Oilpan + LSan: as the callbackHandler() singleton is used by Resource

[yhirano, 2016/08/29 04:34:11]

haraken@: Sorry I forgot to ask, I don't know if we should keep this comment and
LEAK_SANITIZER_DISABLED_SCOPE. Can you tell me?

[haraken, 2016/08/29 04:37:02]

This is a oilpan & DISABLE_STATIC_LOCAL specific thing. So you can just remove
the comment and the scope.

[yhirano, 2016/08/29 04:40:46]

Thanks!

     // and ResourcePtr finalizers, it cannot be released upon shutdown in
     // preparation for leak detection.
     //
     // Keep it out of LSan's reach instead.
     LEAK_SANITIZER_DISABLED_SCOPE;
-    DEFINE_STATIC_LOCAL(ResourceCallback, callbackHandler, (new ResourceCallback));
+    DEFINE_STATIC_LOCAL(ResourceCallback, callbackHandler, ());
     return callbackHandler;
 }
 
-DEFINE_TRACE(Resource::ResourceCallback)
-{
-    visitor->trace(m_resourcesWithPendingClients);
-}
-
 Resource::ResourceCallback::ResourceCallback()
     : m_callbackTaskFactory(CancellableTaskFactory::create(this, &ResourceCallback::runTask))
 {
 }
 
 void Resource::ResourceCallback::schedule(Resource* resource)
 {
     if (!m_callbackTaskFactory->isPending())
         Platform::current()->currentThread()->scheduler()->loadingTaskRunner()->postTask(BLINK_FROM_HERE, m_callbackTaskFactory->cancelAndCreate());
     m_resourcesWithPendingClients.add(resource);
@@ skipping 794 matching lines @@
     case Resource::TextTrack:
     case Resource::Media:
     case Resource::Manifest:
         return false;
     }
     ASSERT_NOT_REACHED();
     return false;
 }
 
 } // namespace blink