| Index: Source/core/css/CSSFontSelector.cpp
|
| diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp
|
| index eacd0e936046cbcee37cea36daf91ea459d9ac85..a112a1969a4efbf601453d650bd78db235651392 100644
|
| --- a/Source/core/css/CSSFontSelector.cpp
|
| +++ b/Source/core/css/CSSFontSelector.cpp
|
| @@ -157,13 +157,13 @@ static AtomicString familyNameFromSettings(const GenericFontFamilySettings& sett
|
| UScriptCode script = fontDescription.script();
|
|
|
| #if OS(ANDROID)
|
| - if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
|
| + if (fontDescription.genericFamily() == FontDescription::StandardFamily)
|
| return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script);
|
|
|
| if (genericFamilyName.startsWith("-webkit-"))
|
| return FontCache::getGenericFamilyNameForScript(genericFamilyName, script);
|
| #else
|
| - if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
|
| + if (fontDescription.genericFamily() == FontDescription::StandardFamily)
|
| return settings.standard(script);
|
| if (genericFamilyName == FontFamilyNames::webkit_serif)
|
| return settings.serif(script);
|
|
|