diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp index 166e2c3e4ba..9b83e9e2182 100644 --- a/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp +++ b/chromium/third_party/WebKit/Source/core/css/CSSFontSelector.cpp @@ -167,12 +167,15 @@ static AtomicString familyNameFromSettings(const GenericFontFamilySettings& sett { UScriptCode script = fontDescription.script(); +#if OS(ANDROID) if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont()) - return settings.standard(script); + return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script); -#if OS(ANDROID) - return FontCache::getGenericFamilyNameForScript(genericFamilyName, script); + if (genericFamilyName.startsWith("-webkit-")) + return FontCache::getGenericFamilyNameForScript(genericFamilyName, script); #else + if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont()) + return settings.standard(script); if (genericFamilyName == FontFamilyNames::webkit_serif) return settings.serif(script); if (genericFamilyName == FontFamilyNames::webkit_sans_serif) |