Use font manager for fallback on Android.

Source/platform/fonts/android/FontCacheAndroid.cpp

 /*
  * Copyright (c) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/FontCache.h"
 
 
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
-
-#include "SkTypeface_android.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "third_party/skia/include/ports/SkFontMgr.h"
 
 namespace blink {
 
 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
 {
     // This is a hack to use the preferred font for CJK scripts.
     // FIXME: Use new Skia API once Android system supports per-family and per-script fallback fonts.
     const char* locale;
     switch (script) {
     case USCRIPT_SIMPLIFIED_HAN:
         locale = "zh-CN";
         break;
     case USCRIPT_TRADITIONAL_HAN:
         locale = "zh-TW";
         break;
     case USCRIPT_KATAKANA_OR_HIRAGANA:
         locale = "ja";
         break;
     case USCRIPT_HANGUL:
         locale = "ko";
         break;
     default:
         locale = 0;
         break;
     }
 
-    SkString skiaFamilyName;
-    if (!SkGetFallbackFamilyNameForChar(c, locale, &skiaFamilyName) || skiaFamilyName.isEmpty())
+    RefPtr<SkFontMgr> fm = adoptRef((SkFontMgr::RefDefault()));

[jbroman, 2014/08/07 16:36:40]

drive-by nit: why the double parentheses for both adoptRef calls?

[bungeman-skia, 2014/08/07 16:41:32]

Thanks, for pointing that out, will fix. This was due to moving things about, I
suspect.

+    RefPtr<SkTypeface> typeface = adoptRef((fm->matchFamilyStyleCharacter(0, SkFontStyle(), locale, c)));
+    if (!typeface)
         return emptyAtom;
 
+    SkString skiaFamilyName;
+    typeface->getFamilyName(&skiaFamilyName);
     return skiaFamilyName.c_str();
 }
 
 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*)
 {
     AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.script());
     if (familyName.isEmpty())
         return getLastResortFallbackFont(fontDescription, DoNotRetain);
     return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, FontFaceCreationParams(familyName)), DoNotRetain);
 }
@@ skipping 15 matching lines @@
         break;
     default:
         // For other scripts, use the default generic family mapping logic.
         return familyName;
     }
 
     return getFamilyNameForCharacter(examplerChar, script);
 }
 
 } // namespace blink