Update fontMgr to take list of bcp47 language tags.

src/ports/SkFontMgr_android.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 "SkFontConfigParser_android.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
@@ skipping 328 matching lines @@
                 if (fFontStyleSets[i]->fStyles[j] == typeface) {
                     return fFontStyleSets[i]->matchStyle(style);
                 }
             }
         }
         return NULL;
     }
 
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
                                                     const SkFontStyle& style,
-                                                    const char bpc47[],
-                                                    uint32_t character) const SK_OVERRIDE
+                                                    const char* bcp47[],
+                                                    int bcpLength,
+                                                    SkUnichar character) const SK_OVERRIDE
     {
         // The variant 'elegant' is 'not squashed', 'compact' is 'stays in ascent/descent'.
         // The variant 'default' means 'compact and elegant'.
         // As a result, it is not possible to know the variant context from the font alone.
         // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request.
 
         // For compatibility, try 'elegant' fonts first in fallback.
         uint32_t variantMask = kElegant_FontVariant;
 
         // The first time match anything in the mask, second time anything not in the mask.
         for (bool maskMatches = true; maskMatches != false; maskMatches = false) {
-            SkLanguage lang(bpc47);
+            int bcpNext = 1;
+            SkLanguage lang((bcpLength > 0) ? bcp47[0] : NULL);
             // Match against the language, removing a segment each time.
             // The last time through the loop, the language will be empty.
             // The empty language is special, and matches all languages.
-            do {
+            bool searchComplete = false;
+            while (!searchComplete) {
                 const SkString& langTag = lang.getTag();
                 for (int i = 0; i < fFallbackNameToFamilyMap.count(); ++i) {
                     SkFontStyleSet_Android* family = fFallbackNameToFamilyMap[i].styleSet;
                     SkAutoTUnref<SkTypeface_AndroidSystem> face(family->matchStyle(style));
 
                     if (!langTag.isEmpty() && langTag != face->fLang.getTag()) {
                         continue;
                     }
 
                     if (SkToBool(face->fVariantStyle & variantMask) != maskMatches) {
                         continue;
                     }
 
                     SkPaint paint;
                     paint.setTypeface(face);
                     paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
 
                     uint16_t glyphID;
                     paint.textToGlyphs(&character, sizeof(character), &glyphID);
                     if (glyphID != 0) {
                         return face.detach();
                     }
                 }
-            } while (!lang.getTag().isEmpty() && (lang = lang.getParent(), true));
+
+                if (!langTag.isEmpty()) {
+                    lang = lang.getParent();
+                    // move onto the next language tag until we exhaust them and
+                    // only then fall through to the default case (i.e. empty lang).
+                    if (lang.getTag().isEmpty() && bcpNext < bcpLength) {
+                        lang.set(bcp47[bcpNext++]);
+                    }
+                } else {
+                    searchComplete = true;
+                }
+            }
         }
         return NULL;
     }
 
     virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE {
         SkAutoTUnref<SkStream> stream(new SkMemoryStream(data));
         return this->createFromStream(stream, ttcIndex);
     }
 
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
@@ skipping 129 matching lines @@
     SkDEBUGF(("Use Test Config File Main %s, Fallback %s, Font Dir %s",
               gTestMainConfigFile, gTestFallbackConfigFile, gTestFontFilePrefix));
 }
 
 void SkGetTestFontConfiguration(const char** mainconf, const char** fallbackconf,
                                 const char** fontsdir) {
     *mainconf = gTestMainConfigFile;
     *fallbackconf = gTestFallbackConfigFile;
     *fontsdir = gTestFontFilePrefix;
 }