Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/css/RemoteFontFaceSource.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/RemoteFontFaceSource.h"
 
 #include "core/css/CSSCustomFontData.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/FontLoader.h"
 #include "core/page/NetworkStateNotifier.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
-RemoteFontFaceSource::RemoteFontFaceSource(FontResource* font, PassRefPtrWillBeRawPtr<FontLoader> fontLoader, FontDisplay display)
+RemoteFontFaceSource::RemoteFontFaceSource(PassRefPtrWillBeRawPtr<FontResource> font, PassRefPtrWillBeRawPtr<FontLoader> fontLoader, FontDisplay display)
     : m_font(font)
     , m_fontLoader(fontLoader)
     , m_display(display)
     , m_period(display == FontDisplaySwap ? SwapPeriod : BlockPeriod)
     , m_isInterventionTriggered(false)
 {
 #if ENABLE(OILPAN)
     ThreadState::current()->registerPreFinalizer(this);
 #endif
     m_font->addClient(this);
@@ skipping 11 matching lines @@
 RemoteFontFaceSource::~RemoteFontFaceSource()
 {
 #if !ENABLE(OILPAN)
     dispose();
 #endif
 }
 
 void RemoteFontFaceSource::dispose()
 {
     m_font->removeClient(this);
+    m_font = nullptr;
     pruneTable();
 }
 
 void RemoteFontFaceSource::pruneTable()
 {
     if (m_fontDataTable.isEmpty())
         return;
 
     for (const auto& item : m_fontDataTable) {
         SimpleFontData* fontData = item.value.get();
@@ skipping 117 matching lines @@
 {
     if (m_font->stillNeedsLoad())
         m_fontLoader->addFontToBeginLoading(m_font.get());
 
     if (m_face)
         m_face->didBeginLoad();
 }
 
 DEFINE_TRACE(RemoteFontFaceSource)
 {
+    visitor->trace(m_font);
     visitor->trace(m_fontLoader);
     CSSFontFaceSource::trace(visitor);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::loadStarted()
 {
     if (!m_loadStartTime)
         m_loadStartTime = currentTimeMS();
 }
 
@@ skipping 89 matching lines @@
         interventionResult |= 1 << 0;
     if (triggered)
         interventionResult |= 1 << 1;
     const int boundary = 1 << 2;
 
     DEFINE_STATIC_LOCAL(EnumerationHistogram, interventionHistogram, ("WebFont.InterventionResult", boundary));
     interventionHistogram.count(interventionResult);
 }
 
 } // namespace blink