Clean up font loading

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 377 matching lines @@
     else
         m_callbacks.append(callback);
 }
 
 void FontFace::loadInternal(ExecutionContext* context)
 {
     if (m_status != Unloaded)
         return;
 
     m_cssFontFace->load();
-    toDocument(context)->styleEngine().fontSelector()->fontLoader()->loadPendingFonts();
 }
 
 FontTraits FontFace::traits() const
 {
     FontStretch stretch = FontStretchNormal;
     if (m_stretch) {
         if (!m_stretch->isPrimitiveValue())
             return 0;
 
         switch (toCSSPrimitiveValue(m_stretch.get())->getValueID()) {
@@ skipping 176 matching lines @@
         // An item in the list either specifies a string (local font name) or a URL (remote font to download).
         CSSFontFaceSrcValue* item = toCSSFontFaceSrcValue(srcList->item(i));
         CSSFontFaceSource* source = nullptr;
 
         if (!item->isLocal()) {
             const Settings* settings = document ? document->settings() : nullptr;
             bool allowDownloading = settings && settings->downloadableBinaryFontsEnabled();
             if (allowDownloading && item->isSupportedFormat() && document) {
                 FontResource* fetched = item->fetch(document);
                 if (fetched) {
-                    FontLoader* fontLoader = document->styleEngine().fontSelector()->fontLoader();
-                    source = new RemoteFontFaceSource(fetched, fontLoader, CSSValueToFontDisplay(m_display.get()));
+                    CSSFontSelector* fontSelector = document->styleEngine().fontSelector();
+                    source = new RemoteFontFaceSource(fetched, fontSelector, CSSValueToFontDisplay(m_display.get()));
                 }
             }
         } else {
             source = new LocalFontFaceSource(item->resource());
         }
 
         if (source)
             m_cssFontFace->addSource(source);
     }
 
@@ skipping 38 matching lines @@
 {
     return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const
 {
     return m_status == Loading && getExecutionContext() && !getExecutionContext()->activeDOMObjectsAreStopped();
 }
 
 } // namespace blink