Adaptation to Skia FontMgr API change

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 25 matching lines @@
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 
 namespace blink {
 
 static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription& fontDescription)
 {
     RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());
-    RefPtr<SkTypeface> typeface = adoptRef(fm->matchFamilyStyleCharacter(0, SkFontStyle(), fontDescription.locale().isEmpty() ? defaultLanguage().ascii().data() : fontDescription.locale().ascii().data(), c));
+    const char* bcp47Locales[2];
+    int localeCount = 0;
+    CString fontLocale;
+    if (!fontDescription.locale().isEmpty()) {
+        fontLocale = fontDescription.locale().ascii();
+        bcp47Locales[localeCount++] = fontLocale.data();
+    }
+    CString defaultLocale = defaultLanguage().ascii();
+    bcp47Locales[localeCount++] = defaultLocale.data();

[bungeman-chromium, 2014/10/23 16:55:41]

I now have this documented and working more like a stack (to support having a
hierarchy of renderer language (system), header (Content-Language), and the
stack of active 'lang' tags). As a result, we need to put the 'defaultLocale' at
index 0, and the fontLocale (if it exists) at index 1.

+    RefPtr<SkTypeface> typeface = adoptRef(fm->matchFamilyStyleCharacter(0, SkFontStyle(), bcp47Locales, localeCount, 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*)
 {
@@ skipping 20 matching lines @@
         break;
     default:
         // For other scripts, use the default generic family mapping logic.
         return familyName;
     }
 
     return getFamilyNameForCharacter(examplerChar, fontDescription);
 }
 
 } // namespace blink