CSSSegmentedFontFaceCache should not know about Document.

CSSSegmentedFontFaceCache should not know about Document.

1) Remove dependency on Document (and core/dom, for that matter)
in CSSSegmentedFontFaceCache
2) Shorten function names to make the sounds sweet.

This removes another place where CSSFontSelector is expected to know
about Document.

R=eae,eseidel,ksakamoto@chromium.org
BUG=324991
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=163152

[eae, 2013-12-04 00:18:40]

LGTM

[commit-bot: I haz the power, 2013-12-04 00:18:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dglazkov@chromium.org/103273002/1

[commit-bot: I haz the power, 2013-12-04 00:19:02]

Failed to apply patch for Source/core/css/CSSFontSelector.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/css/CSSFontSelector.cpp
  Hunk #1 succeeded at 151 with fuzz 1 (offset -2 lines).
  Hunk #2 FAILED at 193.
  Hunk #3 succeeded at 210 (offset 4 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/css/CSSFontSelector.cpp.rej

Patch:       Source/core/css/CSSFontSelector.cpp
Index: Source/core/css/CSSFontSelector.cpp
diff --git a/Source/core/css/CSSFontSelector.cpp
b/Source/core/css/CSSFontSelector.cpp
index
d44965d40bdd1a31ebbac5687fc1de577b6816a1..e99417eefdae92dad3db124c512b9d2ed238bd5c
100644
--- a/Source/core/css/CSSFontSelector.cpp
+++ b/Source/core/css/CSSFontSelector.cpp
@@ -153,14 +153,14 @@ 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)
@@ -193,7 +193,7 @@ static AtomicString familyNameFromSettings(const
GenericFontFamilySettings& sett
 
 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.
@@ -206,7 +206,7 @@ PassRefPtr<FontData> CSSFontSelector::getFontData(const
FontDescription& fontDes
 
 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)

[commit-bot: I haz the power, 2013-12-04 03:21:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dglazkov@chromium.org/103273002/1

[commit-bot: I haz the power, 2013-12-04 09:54:24]

Change committed as 163152