auto import from //depot/cupcake/@136594

1 files changed, 5 insertions, 5 deletions

diff --git a/WebCore/css/CSSFontSelector.cpp b/WebCore/css/CSSFontSelector.cpp
index 0c8cf74..5005c39 100644
--- a/WebCore/css/CSSFontSelector.cpp
+++ b/WebCore/css/CSSFontSelector.cpp
@@ -65,12 +65,12 @@ CSSFontSelector::CSSFontSelector(Document* document)
     // seem to be any such guarantee.
 
     ASSERT(m_document);
-    FontCache::addClient(this);
+    fontCache()->addClient(this);
 }
 
 CSSFontSelector::~CSSFontSelector()
 {
-    FontCache::removeClient(this);
+    fontCache()->removeClient(this);
     deleteAllValues(m_fontFaces);
     deleteAllValues(m_locallyInstalledFontFaces);
     deleteAllValues(m_fonts);
@@ -338,7 +338,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
             Vector<RefPtr<CSSFontFace> >* familyLocallyInstalledFaces;
 
             Vector<unsigned> locallyInstalledFontsTraitsMasks;
-            FontCache::getTraitsInFamily(familyName, locallyInstalledFontsTraitsMasks);
+            fontCache()->getTraitsInFamily(familyName, locallyInstalledFontsTraitsMasks);
             unsigned numLocallyInstalledFaces = locallyInstalledFontsTraitsMasks.size();
             if (numLocallyInstalledFaces) {
                 familyLocallyInstalledFaces = new Vector<RefPtr<CSSFontFace> >;
@@ -357,7 +357,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
     }
 }
 
-void CSSFontSelector::fontLoaded(CSSSegmentedFontFace*)
+void CSSFontSelector::fontLoaded()
 {
     if (!m_document || m_document->inPageCache() || !m_document->renderer())
         return;
@@ -397,7 +397,7 @@ static FontData* fontDataForGenericFamily(Document* document, const FontDescript
         genericFamily = settings->standardFontFamily();
 
     if (!genericFamily.isEmpty())
-        return FontCache::getCachedFontData(FontCache::getCachedFontPlatformData(fontDescription, genericFamily));
+        return fontCache()->getCachedFontData(fontCache()->getCachedFontPlatformData(fontDescription, genericFamily));
 
     return 0;
 }