Clean up font loading

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 "wtf/Allocator.h"
 
 namespace blink {
 
-class FontLoader;
+class CSSFontSelector;
 
 enum FontDisplay {
     FontDisplayAuto,
     FontDisplayBlock,
     FontDisplaySwap,
     FontDisplayFallback,
     FontDisplayOptional,
     FontDisplayEnumMax
 };
 
 class RemoteFontFaceSource final : public CSSFontFaceSource, public FontResourceClient {
     USING_PRE_FINALIZER(RemoteFontFaceSource, dispose);
 public:
     enum DisplayPeriod { BlockPeriod, SwapPeriod, FailurePeriod };
 
-    explicit RemoteFontFaceSource(FontResource*, FontLoader*, FontDisplay);
+    explicit RemoteFontFaceSource(FontResource*, CSSFontSelector*, FontDisplay);
     ~RemoteFontFaceSource() override;
     void dispose();
 
     bool isLoading() const override;
     bool isLoaded() const override;
     bool isValid() const override;
     DisplayPeriod getDisplayPeriod() const { return m_period; }
 
     void beginLoadIfNeeded() override;
 
-    void didStartFontLoad(FontResource*) override;
     void fontLoaded(FontResource*) override;
     void fontLoadShortLimitExceeded(FontResource*) override;
     void fontLoadLongLimitExceeded(FontResource*) override;
     String debugName() const override { return "RemoteFontFaceSource"; }
 
     // For UMA reporting
     bool hadBlankText() override { return m_histograms.hadBlankText(); }
     void paintRequested() { m_histograms.fallbackFontPainted(m_period); }
 
     DECLARE_VIRTUAL_TRACE();
@@ skipping 20 matching lines @@
         void recordInterventionResult(bool triggered);
         double m_loadStartTime;
         double m_blankPaintTime;
         bool m_isLongLimitExceeded;
     };
 
     void switchToSwapPeriod();
     void switchToFailurePeriod();
 
     Member<FontResource> m_font;
-    Member<FontLoader> m_fontLoader;
+    Member<CSSFontSelector> m_fontSelector;
     const FontDisplay m_display;
     DisplayPeriod m_period;
     FontLoadHistograms m_histograms;
     bool m_isInterventionTriggered;
 };
 
 } // namespace blink
 
 #endif