Clean up font loading

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

Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
index 01780734d8cf83cad1ac4045020fbe1331339ae0..952b2d8fc31ec85802b6c28db829fdeec0166963 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
@@ -11,7 +11,7 @@
 
 namespace blink {
 
-class FontLoader;
+class CSSFontSelector;
 
 enum FontDisplay {
     FontDisplayAuto,
@@ -27,7 +27,7 @@ class RemoteFontFaceSource final : public CSSFontFaceSource, public FontResource
 public:
     enum DisplayPeriod { BlockPeriod, SwapPeriod, FailurePeriod };
 
-    explicit RemoteFontFaceSource(FontResource*, FontLoader*, FontDisplay);
+    explicit RemoteFontFaceSource(FontResource*, CSSFontSelector*, FontDisplay);
     ~RemoteFontFaceSource() override;
     void dispose();
 
@@ -38,7 +38,6 @@ public:
 
     void beginLoadIfNeeded() override;
 
-    void didStartFontLoad(FontResource*) override;
     void fontLoaded(FontResource*) override;
     void fontLoadShortLimitExceeded(FontResource*) override;
     void fontLoadLongLimitExceeded(FontResource*) override;
@@ -79,7 +78,7 @@ private:
     void switchToFailurePeriod();
 
     Member<FontResource> m_font;
-    Member<FontLoader> m_fontLoader;
+    Member<CSSFontSelector> m_fontSelector;
     const FontDisplay m_display;
     DisplayPeriod m_period;
     FontLoadHistograms m_histograms;