commit 88cbe09d1491b854843497762879714797e83062
author Ben Murdoch <benm@google.com> Tue Mar 04 13:17:17 2014 +0000
committer Ben Murdoch <benm@google.com> Tue Mar 04 13:17:17 2014 +0000
tree 66b56547894bf8537dbc7e4fcca2640d52c9381f
parent 0b454d6c97e77ac50520558aafed03a4d1ebbbb6

Cherry pick: Fix generic font family issue on Android

Bug: 13237403

Original description:
Fix generic font family issue on Android

- standard font family should go Android path on Android;
- for non-generic font families, familyNameFromSettings should return
an empty AtomicString.

BUG=347121
TEST=platform/android/fast/text/international/non-generic-font-fallback.html
R=dglazkov@chromium.org

Committed:
https://src.chromium.org/viewvc/blink?view=rev&revision=168173

Change-Id: I6962d496c3a2f320a993e8d4bce02ee33dca983b

Source/core/css/CSSFontSelector.cpp

diff --git a/Source/core/css/CSSFontSelector.cpp b/Source/core/css/CSSFontSelector.cpp
index 166e2c3..9b83e9e 100644
--- a/Source/core/css/CSSFontSelector.cpp
+++ b/Source/core/css/CSSFontSelector.cpp
@@ -167,12 +167,15 @@
 {
     UScriptCode script = fontDescription.script();
 
+#if OS(ANDROID)
+    if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
+        return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script);
+
+    if (genericFamilyName.startsWith("-webkit-"))
+        return FontCache::getGenericFamilyNameForScript(genericFamilyName, script);
+#else
     if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
         return settings.standard(script);
-
-#if OS(ANDROID)
-    return FontCache::getGenericFamilyNameForScript(genericFamilyName, script);
-#else
     if (genericFamilyName == FontFamilyNames::webkit_serif)
         return settings.serif(script);
     if (genericFamilyName == FontFamilyNames::webkit_sans_serif)