CSSSegmentedFontFaceCache should not know about Document.

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 135 matching lines @@
 void CSSFontSelector::fontLoaded()
 {
     dispatchInvalidationCallbacks();
 }
 
 void CSSFontSelector::fontCacheInvalidated()
 {
     dispatchInvalidationCallbacks();
 }
 
-void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule)
+void CSSFontSelector::addFontFaceRule(const StyleRuleFontFace* fontFaceRule, PassRefPtr<CSSFontFace> cssFontFace)
 {
-    m_cssSegmentedFontFaceCache.addFontFaceRule(this, fontFaceRule);
+    m_cssSegmentedFontFaceCache.add(this, fontFaceRule, cssFontFace);
 }
 
 void CSSFontSelector::removeFontFaceRule(const StyleRuleFontFace* fontFaceRule)
 {
-    m_cssSegmentedFontFaceCache.removeFontFaceRule(fontFaceRule);
+    m_cssSegmentedFontFaceCache.remove(fontFaceRule);
 }
 
 static AtomicString familyNameFromSettings(const GenericFontFamilySettings& settings, const FontDescription& fontDescription, const AtomicString& genericFamilyName)
 {
     UScriptCode script = fontDescription.script();
 
     if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
         return settings.standard(script);
 
 #if OS(ANDROID)
@@ skipping 12 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& familyName)
 {
-    if (CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.getFontFace(fontDescription, familyName))
+    if (CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.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, familyName);
     if (settingsFamilyName.isEmpty())
         return 0;
 
     return fontCache()->getFontResourceData(fontDescription, settingsFamilyName);
 }
 
 CSSSegmentedFontFace* CSSFontSelector::getFontFace(const FontDescription& fontDescription, const AtomicString& familyName)
 {
-    return m_cssSegmentedFontFaceCache.getFontFace(fontDescription, familyName);
+    return m_cssSegmentedFontFaceCache.get(fontDescription, familyName);
 }
 
 void CSSFontSelector::willUseFontData(const FontDescription& fontDescription, const AtomicString& family)
 {
     CSSSegmentedFontFace* face = getFontFace(fontDescription, family);
     if (face)
         face->willUseFontData(fontDescription);
 }
 
 void CSSFontSelector::clearDocument()
 {
     m_fontLoader.clearResourceFetcher();
     m_document = 0;
 }
 
 void CSSFontSelector::beginLoadingFontSoon(FontResource* font)
 {
     m_fontLoader.addFontToBeginLoading(font);
 }
 
 void CSSFontSelector::loadPendingFonts()
 {
     m_fontLoader.loadPendingFonts();
 }
 
 }