Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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

 // 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.
 
 #ifndef RemoteFontFaceSource_h
 #define RemoteFontFaceSource_h
 
 #include "core/css/CSSFontFaceSource.h"
 #include "core/fetch/FontResource.h"
-#include "core/fetch/ResourcePtr.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
 class FontLoader;
 
 enum FontDisplay {
     FontDisplayAuto,
     FontDisplayBlock,
     FontDisplaySwap,
     FontDisplayFallback,
     FontDisplayOptional,
     FontDisplayEnumMax
 };
 
 class RemoteFontFaceSource final : public CSSFontFaceSource, public FontResourceClient {
     WILL_BE_USING_PRE_FINALIZER(RemoteFontFaceSource, dispose);
 public:
     enum DisplayPeriod { BlockPeriod, SwapPeriod, FailurePeriod };
 
-    explicit RemoteFontFaceSource(FontResource*, PassRefPtrWillBeRawPtr<FontLoader>, FontDisplay);
+    explicit RemoteFontFaceSource(PassRefPtrWillBeRawPtr<FontResource>, PassRefPtrWillBeRawPtr<FontLoader>, FontDisplay);
     ~RemoteFontFaceSource() override;
     void dispose();
 
     FontResource* resource() override { return m_font.get(); }
     bool isLoading() const override;
     bool isLoaded() const override;
     bool isValid() const override;
     DisplayPeriod displayPeriod() const { return m_period; }
 
     void beginLoadIfNeeded() override;
@@ skipping 31 matching lines @@
         void recordLoadTimeHistogram(const FontResource*, int duration);
         void recordInterventionResult(bool triggered);
         double m_loadStartTime;
         double m_fallbackPaintTime;
         bool m_isLongLimitExceeded;
     };
 
     void switchToSwapPeriod();
     void switchToFailurePeriod();
 
-    ResourcePtr<FontResource> m_font;
+    RefPtrWillBeMember<FontResource> m_font;
     RefPtrWillBeMember<FontLoader> m_fontLoader;
     const FontDisplay m_display;
     DisplayPeriod m_period;
     FontLoadHistograms m_histograms;
     bool m_isInterventionTriggered;
 };
 
 } // namespace blink
 
 #endif