Clean up font loading

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

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 26 matching lines @@
 #include "core/loader/FrameLoader.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "wtf/text/AtomicString.h"
 
 namespace blink {
 
 CSSFontSelector::CSSFontSelector(Document* document)
     : m_document(document)
-    , m_fontLoader(FontLoader::create(this, document))
     , m_genericFontFamilySettings(document->frame()->settings()->genericFontFamilySettings())
 {
     // FIXME: An old comment used to say there was no need to hold a reference to m_document
     // because "we are guaranteed to be destroyed before the document". But there does not
     // seem to be any such guarantee.
 
     ASSERT(m_document);
     ASSERT(m_document->frame());
     FontCache::fontCache()->addClient(this);
     FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
@@ skipping 100 matching lines @@
 {
     AtomicString family = familyNameFromSettings(m_genericFontFamilySettings, fontDescription, passedFamily);
     if (family.isEmpty())
         family = passedFamily;
     return FontCache::fontCache()->isPlatformFontAvailable(fontDescription, family);
 }
 
 #if !ENABLE(OILPAN)
 void CSSFontSelector::clearDocument()
 {
-    m_fontLoader->clearDocumentAndFontSelector();
     m_document = nullptr;
     m_fontFaceCache.clearAll();
 }
 #endif
 
 void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
 {
     if (!document.settings())
         return;
     m_genericFontFamilySettings = document.settings()->genericFontFamilySettings();
     fontCacheInvalidated();
 }
 
 DEFINE_TRACE(CSSFontSelector)
 {
     visitor->trace(m_document);
     visitor->trace(m_fontFaceCache);
     visitor->trace(m_clients);
-    visitor->trace(m_fontLoader);
     FontSelector::trace(visitor);
 }
 
 } // namespace blink