Fix generic font family issue on Android

Source/core/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 138 matching lines @@
 
 void CSSFontSelector::fontCacheInvalidated()
 {
     dispatchInvalidationCallbacks();
 }
 
 static AtomicString familyNameFromSettings(const GenericFontFamilySettings& settings, const FontDescription& fontDescription, const AtomicString& genericFamilyName)
 {
     UScriptCode script = fontDescription.script();
 
+#if OS(ANDROID)
+    if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
+        return FontCache::getGenericFamilyNameForScript(FontFamilyNames::webkit_standard, script);

[dglazkov, 2014/02/28 21:30:30]

This is okay, but can we not instead unfork this codepath? Effectively,
getGenericFamilyNameForScript does the same thing as
FontCache::getFontFamilyForCharacter, and we shouldn't need to call it here?

[Xianzhu, 2014/02/28 22:15:12]

FontCache::getFontFamilyForCharacter doesn't actually work for multiple locales,
because we don't have separated entries for different locales in a single glyph
tree. To make it work we need an additional field m_locale in FontDescription
and FontData, so that we can distinguish different locales of them. I tried this
method several months ago in https://codereview.chromium.org/23503080/, but
finally chose https://codereview.chromium.org/24622002/ because of the
complexity and uncertainty about memory and performance of the former.

Actually we have already distinguished locales at the top level if different
locales has different font families for generic font families. This seems more
efficient than distinguish locales at each GlyphPageTreeNode. For now we require
glyphs in one glyph tree are for the same locale. Breaking this causes bugs,
like this one, and crbug.com/348078.

The forked codepath for Android is to meet the above requirement.

I think crbug.com/348078 can also be resolved with the similar method.

+
+    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)
         return settings.sansSerif(script);
     if (genericFamilyName == FontFamilyNames::webkit_cursive)
         return settings.cursive(script);
     if (genericFamilyName == FontFamilyNames::webkit_fantasy)
         return settings.fantasy(script);
     if (genericFamilyName == FontFamilyNames::webkit_monospace)
         return settings.fixed(script);
@@ skipping 41 matching lines @@
     m_fontLoader.loadPendingFonts();
 }
 
 void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
 {
     ASSERT(document.settings());
     m_genericFontFamilySettings = document.settings()->genericFontFamilySettings();
 }
 
 }