Index: sky/engine/core/css/CSSFontSelector.cpp |
diff --git a/sky/engine/core/css/CSSFontSelector.cpp b/sky/engine/core/css/CSSFontSelector.cpp |
index 2b81458dc617777bf4a8ea3d7fcff90b024ff69b..a45b8765268bf02c54f6ac6a0a1592582ddea043 100644 |
--- a/sky/engine/core/css/CSSFontSelector.cpp |
+++ b/sky/engine/core/css/CSSFontSelector.cpp |
@@ -97,15 +97,15 @@ void CSSFontSelector::fontCacheInvalidated() |
static AtomicString familyNameFromSettings(const GenericFontFamilySettings& settings, const FontDescription& fontDescription, const AtomicString& genericFamilyName) |
{ |
- UScriptCode script = fontDescription.script(); |
- |
#if OS(ANDROID) |
if (fontDescription.genericFamily() == FontDescription::StandardFamily) |
- return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script); |
+ return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, fontDescription); |
if (genericFamilyName.startsWith("-webkit-")) |
- return FontCache::getGenericFamilyNameForScript(genericFamilyName, script); |
+ return FontCache::getGenericFamilyNameForScript(genericFamilyName, fontDescription); |
#else |
+ UScriptCode script = fontDescription.script(); |
+ |
if (fontDescription.genericFamily() == FontDescription::StandardFamily) |
return settings.standard(script); |
if (genericFamilyName == FontFamilyNames::webkit_serif) |