Index: Source/core/css/CSSFontSelector.cpp |
diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp |
index a15bf91dd170b804f130c4a6300cbe7fe83a3c8b..618fea40bc886a21d0a330f333604346dc8f4d91 100644 |
--- a/Source/core/css/CSSFontSelector.cpp |
+++ b/Source/core/css/CSSFontSelector.cpp |
@@ -156,12 +156,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); |
dglazkov
2014/02/28 21:30:30
This is okay, but can we not instead unfork this c
Xianzhu
2014/02/28 22:15:12
FontCache::getFontFamilyForCharacter doesn't actua
|
-#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) |