Extend FontCache fallback API to support FontFallbackPriority

third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

Index: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
index 4a5521003683722aebd3769c2c024ad48bd1d514..57da4b2d358f0040547f2348d8bf24c3b48712c5 100644
--- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
+++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
@@ -41,6 +41,8 @@
 
 namespace blink {
 
+static const char* kAndroidColorEmojiLocale = "und-Zsye";

[eae, 2016/03/02 18:26:54]

Zsye? This could use  a comment explaining it.

+
 // SkFontMgr requires script-based locale names, like "zh-Hant" and "zh-Hans",
 // instead of "zh-CN" and "zh-TW".
 static CString toSkFontMgrLocale(const String& locale)
@@ -58,11 +60,16 @@ static CString toSkFontMgrLocale(const String& locale)
     }
 }
 
-static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription& fontDescription)
+static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription& fontDescription, FontFallbackPriority fallbackPriority)
 {
+    const size_t kMaxLocales = 4;
     RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());
-    const char* bcp47Locales[3];
-    int localeCount = 0;
+    const char* bcp47Locales[kMaxLocales];
+    size_t localeCount = 0;
+
+    if (fallbackPriority == FontFallbackPriority::EmojiEmoji) {
+        bcp47Locales[localeCount++] = kAndroidColorEmojiLocale;
+    }
     if (const char* hanLocale = AcceptLanguagesResolver::preferredHanSkFontMgrLocale())
         bcp47Locales[localeCount++] = hanLocale;
     CString defaultLocale = toSkFontMgrLocale(defaultLanguage());
@@ -72,6 +79,7 @@ static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription&
         fontLocale = toSkFontMgrLocale(fontDescription.locale());
         bcp47Locales[localeCount++] = fontLocale.data();
     }
+    ASSERT_WITH_SECURITY_IMPLICATION(localeCount < kMaxLocales);
     RefPtr<SkTypeface> typeface = adoptRef(fm->matchFamilyStyleCharacter(0, SkFontStyle(), bcp47Locales, localeCount, c));
     if (!typeface)
         return emptyAtom;
@@ -81,9 +89,9 @@ static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription&
     return skiaFamilyName.c_str();
 }
 
-PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*)
+PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*, FontFallbackPriority fallbackPriority)
 {
-    AtomicString familyName = getFamilyNameForCharacter(c, fontDescription);
+    AtomicString familyName = getFamilyNameForCharacter(c, fontDescription, fallbackPriority);
     if (familyName.isEmpty())
         return getLastResortFallbackFont(fontDescription, DoNotRetain);
     return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, FontFaceCreationParams(familyName)), DoNotRetain);
@@ -109,7 +117,7 @@ AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family
         return familyName;
     }
 
-    return getFamilyNameForCharacter(examplerChar, fontDescription);
+    return getFamilyNameForCharacter(examplerChar, fontDescription, FontFallbackPriority::Text);
 }
 
 } // namespace blink