Parser for new fonts.xml format

tests/FontConfigParser.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 "Resources.h"
 #include "SkFontConfigParser_android.h"
 #include "Test.h"
 
 void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies,
                          skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5);
     REPORTER_ASSERT(reporter, !strcmp(fontFamilies[0]->fNames[0].c_str(), "sans-serif"));
     REPORTER_ASSERT(reporter,
-                    !strcmp(fontFamilies[0]->fFontFiles[0].fFileName.c_str(),
+                    !strcmp(fontFamilies[0]->fFonts[0].fFileName.c_str(),
                             "Roboto-Regular.ttf"));
     REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont);
 
 }
 
 void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) {
 #if SK_DEBUG_FONTS
     for (int i = 0; i < fontFamilies.count(); ++i) {
         SkDebugf("Family %d:\n", i);
         switch(fontFamilies[i]->fVariant) {
             case SkPaintOptionsAndroid::kElegant_Variant: SkDebugf("  elegant"); break;
             case SkPaintOptionsAndroid::kCompact_Variant: SkDebugf("  compact"); break;
             default: break;
         }
         if (!fontFamilies[i]->fLanguage.getTag().isEmpty()) {
             SkDebugf("  language: %s", fontFamilies[i]->fLanguage.getTag().c_str());
         }
         for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) {
             SkDebugf("  name %s\n", fontFamilies[i]->fNames[j].c_str());
         }
-        for (int j = 0; j < fontFamilies[i]->fFontFiles.count(); ++j) {
-            const FontFileInfo& ffi = fontFamilies[i]->fFontFiles[j];
+        for (int j = 0; j < fontFamilies[i]->fFonts.count(); ++j) {
+            const FontFileInfo& ffi = fontFamilies[i]->fFonts[j];
             SkDebugf("  file (%d %s %d) %s\n",
                      ffi.fWeight,
                      ffi.fPaintOptions.getLanguage().getTag().isEmpty() ? "" :
                          ffi.fPaintOptions.getLanguage().getTag().c_str(),
                      ffi.fPaintOptions.getFontVariant(),
                      ffi.fFileName.c_str());
         }
     }
 #endif // SK_DEBUG_FONTS
 }
@@ skipping 44 matching lines @@
         ValidateLoadedFonts(v22FontFamilies, reporter);
     } else {
         resourcesMissing = true;
     }
 
     if (resourcesMissing) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }