Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
index 160e397c5d064a71b2bb3b11343d38b9cee6fb10..c34eea748fb266a427016279466dc5cd027744bf 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
@@ -17,7 +17,7 @@
 
 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)
@@ -49,6 +49,7 @@ RemoteFontFaceSource::~RemoteFontFaceSource()
 void RemoteFontFaceSource::dispose()
 {
     m_font->removeClient(this);
+    m_font = nullptr;
     pruneTable();
 }
 
@@ -186,6 +187,7 @@ void RemoteFontFaceSource::beginLoadIfNeeded()
 
 DEFINE_TRACE(RemoteFontFaceSource)
 {
+    visitor->trace(m_font);
     visitor->trace(m_fontLoader);
     CSSFontFaceSource::trace(visitor);
 }