Revert of Move the FontFaceCache stored in CSSFontSelector to be stored in Document.

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 34 matching lines @@
 CSSFontSelector::CSSFontSelector(Document* document)
     : m_document(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);
   DCHECK(m_document->frame());
   FontCache::fontCache()->addClient(this);
-  FontFaceSet::from(*document)->addFontFacesToFontFaceCache(this);
+  FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache,
+                                                            this);
 }
 
 CSSFontSelector::~CSSFontSelector() {}
 
 void CSSFontSelector::registerForInvalidationCallbacks(
     CSSFontSelectorClient* client) {
   m_clients.insert(client);
 }
 
 void CSSFontSelector::unregisterForInvalidationCallbacks(
     CSSFontSelectorClient* client) {
   m_clients.remove(client);
 }
 
 void CSSFontSelector::dispatchInvalidationCallbacks() {
-  m_document->incrementFontFaceVersion();
+  m_fontFaceCache.incrementVersion();
 
   HeapVector<Member<CSSFontSelectorClient>> clients;
   copyToVector(m_clients, clients);
   for (auto& client : clients)
     client->fontsNeedUpdate(this);
 }
 
 void CSSFontSelector::fontFaceInvalidated() {
   dispatchInvalidationCallbacks();
 }
@@ skipping 31 matching lines @@
   if (genericFamilyName == FontFamilyNames::webkit_pictograph)
     return settings.pictograph(script);
   if (genericFamilyName == FontFamilyNames::webkit_standard)
     return settings.standard(script);
 #endif
   return emptyAtom;
 }
 
 PassRefPtr<FontData> CSSFontSelector::getFontData(
     const FontDescription& fontDescription,
-    const AtomicString& family) {
-  CSSSegmentedFontFace* face = getFontFaceFromCache(fontDescription, family);
-  if (face)
+    const AtomicString& familyName) {
+  if (CSSSegmentedFontFace* face =
+          m_fontFaceCache.get(fontDescription, familyName))
     return face->getFontData(fontDescription);
 
   // Try to return the correct font based off our settings, in case we were
   // handed the generic font family name.
   AtomicString settingsFamilyName = familyNameFromSettings(
-      m_genericFontFamilySettings, fontDescription, family);
+      m_genericFontFamilySettings, fontDescription, familyName);
   if (settingsFamilyName.isEmpty())
     return nullptr;
 
   return FontCache::fontCache()->getFontData(fontDescription,
                                              settingsFamilyName);
 }
 
 void CSSFontSelector::willUseFontData(const FontDescription& fontDescription,
                                       const AtomicString& family,
                                       const String& text) {
-  CSSSegmentedFontFace* face = getFontFaceFromCache(fontDescription, family);
+  CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family);
   if (face)
     face->willUseFontData(fontDescription, text);
 }
 
 void CSSFontSelector::willUseRange(const FontDescription& fontDescription,
                                    const AtomicString& family,
                                    const FontDataForRangeSet& rangeSet) {
-  CSSSegmentedFontFace* face = getFontFaceFromCache(fontDescription, family);
+  CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family);
   if (face)
     face->willUseRange(fontDescription, rangeSet);
 }
 
 bool CSSFontSelector::isPlatformFontAvailable(
     const FontDescription& fontDescription,
     const AtomicString& passedFamily) {
   AtomicString family = familyNameFromSettings(m_genericFontFamilySettings,
                                                fontDescription, passedFamily);
   if (family.isEmpty())
     family = passedFamily;
   return FontCache::fontCache()->isPlatformFontAvailable(fontDescription,
                                                          family);
 }
 
 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);
   FontSelector::trace(visitor);
 }
 
 }  // namespace blink