Fix append_fallback_font_families_for_locale.

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 229 matching lines @@
     SkString name;
     SkFontStyleSet_Android* styleSet;
 };
 
 class SkFontMgr_Android : public SkFontMgr {
 public:
     SkFontMgr_Android(const SkFontMgr_Android_CustomFonts* custom) {
         SkTDArray<FontFamily*> families;
         if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem != custom->fSystemFontUse) {
             SkString base(custom->fBasePath);
-            SkFontConfigParser::GetCustomFontFamilies(families, base,
-                                                      custom->fFontsXml, custom->fFallbackFontsXml);
+            SkFontConfigParser::GetCustomFontFamilies(
+                families, base, custom->fFontsXml, custom->fFallbackFontsXml, NULL);
         }
         if (!custom ||
             (custom && SkFontMgr_Android_CustomFonts::kOnlyCustom != custom->fSystemFontUse))
         {
             SkFontConfigParser::GetSystemFontFamilies(families);
         }
         if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem == custom->fSystemFontUse) {
             SkString base(custom->fBasePath);
-            SkFontConfigParser::GetCustomFontFamilies(families, base,
-                                                      custom->fFontsXml, custom->fFallbackFontsXml);
+            SkFontConfigParser::GetCustomFontFamilies(
+                families, base, custom->fFontsXml, custom->fFallbackFontsXml, NULL);
         }
         this->buildNameToFamilyMap(families);
         this->findDefaultFont();
         families.deleteAll();
     }
 
 protected:
     /** Returns not how many families we have, but how many unique names
      *  exist among the families.
      */
@@ skipping 268 matching lines @@
 {
     gTestFontsXml = fontsXml;
     gTestFallbackFontsXml = fallbackFontsXml;
     gTestBasePath = basePath;
     SkASSERT(gTestFontsXml);
     SkASSERT(gTestFallbackFontsXml);
     SkASSERT(gTestBasePath);
     SkDEBUGF(("Test BasePath: %s Fonts: %s FallbackFonts: %s\n",
               gTestBasePath, gTestFontsXml, gTestFallbackFontsXml));
 }