Parser for new fonts.xml format

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 187 matching lines @@
         fLocaleFallbackFontList(NULL) {
 
     for (int i = 0; i < fontFamilies.count(); ++i) {
         FontFamily* family = fontFamilies[i];
 
         // defer initializing the familyRec until we can be sure that at least
         // one of it's children contains a valid font file
         FamilyRec* familyRec = NULL;
         FamilyRecID familyRecID = INVALID_FAMILY_REC_ID;
 
-        for (int j = 0; j < family->fFontFiles.count(); ++j) {
+        for (int j = 0; j < family->fFonts.count(); ++j) {
             SkString filename;
-            get_path_for_sys_fonts(&filename, family->fFontFiles[j].fFileName);
+            get_path_for_sys_fonts(&filename, family->fFonts[j].fFileName);
 
             if (has_font(fFonts, filename)) {
                 DEBUG_FONT(("---- system font and fallback font files specify a duplicate "
                         "font %s, skipping the second occurrence", filename.c_str()));
             }
 
             FontRec& fontRec = fFonts.push_back();
             fontRec.fFileName = filename;
             fontRec.fStyle = SkTypeface::kNormal;
             fontRec.fIsValid = false;
@@ skipping 24 matching lines @@
             }
 
             // create a familyRec now that we know that at least one font in
             // the family is valid
             if (familyRec == NULL) {
                 familyRec = &fFontFamilies.push_back();
                 familyRecID = fFontFamilies.count() - 1;
                 fontRec.fFamilyRecID = familyRecID;
 
                 familyRec->fIsFallbackFont = family->fIsFallbackFont;
-                familyRec->fPaintOptions = family->fFontFiles[j].fPaintOptions;
+                familyRec->fPaintOptions = family->fFonts[j].fPaintOptions;
 
-            } else if (familyRec->fPaintOptions != family->fFontFiles[j].fPaintOptions) {
+            } else if (familyRec->fPaintOptions != family->fFonts[j].fPaintOptions) {
                 SkDebugf("Every font file within a family must have identical"
                          "language and variant attributes");
                 sk_throw();
             }
 
             // add this font to the current familyRec
             if (INVALID_FONT_REC_ID != familyRec->fFontRecID[fontRec.fStyle]) {
                 DEBUG_FONT(("Overwriting familyRec for style[%d] old,new:(%d,%d)",
                             fontRec.fStyle, familyRec->fFontRecID[fontRec.fStyle],
                             fontRecID));
@@ skipping 309 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;
 }