Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/css/FontLoader.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/FontLoader.h"
 
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
 #include "core/dom/IncrementLoadEventDelayCount.h"
 #include "core/fetch/FontResource.h"
 #include "core/inspector/ConsoleMessage.h"
 
 namespace blink {
 
-struct FontLoader::FontToLoad {
+struct FontLoader::FontToLoad : public NoBaseWillBeGarbageCollectedFinalized<FontLoader::FontToLoad> {
 public:
-    static PassOwnPtr<FontToLoad> create(FontResource* fontResource, Document& document)
+    static PassOwnPtrWillBeRawPtr<FontToLoad> create(FontResource* fontResource, Document& document)
     {
-        return adoptPtr(new FontToLoad(fontResource, document));
+        return adoptPtrWillBeNoop(new FontToLoad(fontResource, document));
     }
 
-    ResourcePtr<FontResource> fontResource;
+    virtual ~FontToLoad()
+    {
+        ASSERT(!fontResource);
+    }
+
+    RefPtrWillBeMember<FontResource> fontResource;
     OwnPtr<IncrementLoadEventDelayCount> delay;
 
+    void dispose()
+    {
+        fontResource = nullptr;
+        delay.clear();
+    }
+
+    DEFINE_INLINE_TRACE() { visitor->trace(fontResource); }
+
 private:
     FontToLoad(FontResource* resource, Document& document)
         : fontResource(resource)
         , delay(IncrementLoadEventDelayCount::create(document))
     {
     }
 };
 
 FontLoader::FontLoader(CSSFontSelector* fontSelector, Document* document)
     : m_beginLoadingTimer(this, &FontLoader::beginLoadTimerFired)
@@ skipping 36 matching lines @@
 {
     ASSERT(m_document);
 
     FontsToLoadVector fontsToBeginLoading;
     fontsToBeginLoading.swap(m_fontsToBeginLoading);
     for (const auto& fontToLoad : fontsToBeginLoading) {
         if (m_document->frame())
             fontToLoad->fontResource->beginLoadIfNeeded(m_document->fetcher());
         else
             fontToLoad->fontResource->error(Resource::LoadError);
+        fontToLoad->dispose();
     }
 
     // When the local fontsToBeginLoading vector goes out of scope it will
     // decrement the request counts on the ResourceFetcher for all the fonts
     // that were just loaded.
 }
 
 void FontLoader::fontFaceInvalidated()
 {
     if (m_fontSelector)
@@ skipping 21 matching lines @@
 
     m_beginLoadingTimer.stop();
     clearPendingFonts();
     m_document = nullptr;
     m_fontSelector = nullptr;
 }
 #endif
 
 void FontLoader::clearPendingFonts()
 {
-    for (const auto& fontToLoad : m_fontsToBeginLoading)
+    for (const auto& fontToLoad : m_fontsToBeginLoading) {
         fontToLoad->fontResource->didUnscheduleLoad();
+        fontToLoad->dispose();
+    }
     m_fontsToBeginLoading.clear();
 }
 
 DEFINE_TRACE(FontLoader)
 {
+    visitor->trace(m_fontsToBeginLoading);
     visitor->trace(m_document);
     visitor->trace(m_fontSelector);
 }
 
 } // namespace blink