#include "core/css/CSSFontSelector.h"
#include "RuntimeEnabledFeatures.h"
-#include "core/css/CSSFontFace.h"
-#include "core/css/CSSFontFaceRule.h"
-#include "core/css/CSSFontFaceSource.h"
#include "core/css/CSSSegmentedFontFace.h"
#include "core/css/CSSValueList.h"
#include "core/css/FontFaceSet.h"
ASSERT(m_document);
ASSERT(m_document->frame());
FontCache::fontCache()->addClient(this);
- FontFaceSet::from(document)->addFontFacesToCSSSegmentedFontFaceCache(&m_cssSegmentedFontFaceCache, this);
+ FontFaceSet::from(document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
}
CSSFontSelector::~CSSFontSelector()
PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)
{
- if (CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.get(fontDescription, 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.
void CSSFontSelector::willUseFontData(const FontDescription& fontDescription, const AtomicString& family)
{
- CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.get(fontDescription, family);
+ CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family);
if (face)
face->willUseFontData(fontDescription);
}
m_fontLoader.loadPendingFonts();
}
+void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
+{
+ ASSERT(document.settings());
+ m_genericFontFamilySettings = document.settings()->genericFontFamilySettings();
+}
+
}