Update fontMgr to take list of bcp47 language tags.

src/ports/SkFontMgr_fontconfig.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDataTable.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
@@ skipping 744 matching lines @@
 
         FcResult result;
         SkAutoFcPattern font(FcFontMatch(fFC, pattern, &result));
         if (NULL == font || !FontAccessible(font) || !FontFamilyNameMatches(font, matchPattern)) {
             return NULL;
         }
 
         return createTypefaceFromFcPattern(font);
     }
 
+#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
                                                     const SkFontStyle& style,
-                                                    const char bpc47[],
-                                                    uint32_t character) const SK_OVERRIDE
+                                                    const char* bcp47[],
+                                                    int bcp47Count,
+                                                    SkUnichar character) const SK_OVERRIDE
     {
+#else
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
+                                                    const SkFontStyle& style,
+                                                    const char bcp47_val[],
+                                                    SkUnichar character) const SK_OVERRIDE
+    {
+        const char** bcp47 = &bcp47_val;
+        int bcp47Count = bcp47_val ? 1 : 0;
+#endif
         FCLocker lock;
 
         SkAutoFcPattern pattern;
         FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)familyName);
         fcpattern_from_skfontstyle(style, pattern);
 
         SkAutoFcCharSet charSet;
         FcCharSetAddChar(charSet, character);
         FcPatternAddCharSet(pattern, FC_CHARSET, charSet);
 
-        if (bpc47) {
+        if (bcp47Count > 0) {
+            SkASSERT(bcp47);
             SkAutoFcLangSet langSet;
-            FcLangSetAdd(langSet, (const FcChar8*)bpc47);
+            for (int i = bcp47Count; i --> 0;) {
+                FcLangSetAdd(langSet, (const FcChar8*)bcp47[i]);
+            }
             FcPatternAddLangSet(pattern, FC_LANG, langSet);
         }
 
         FcConfigSubstitute(fFC, pattern, FcMatchPattern);
         FcDefaultSubstitute(pattern);
 
         FcResult result;
         SkAutoFcPattern font(FcFontMatch(fFC, pattern, &result));
         if (NULL == font || !FontAccessible(font) || !FontContainsCharacter(font, character)) {
             return NULL;
@@ skipping 52 matching lines @@
             return typeface.detach();
         }
 
         return this->matchFamilyStyle(NULL, style);
     }
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgr_fontconfig);
 }