Parser for new fonts.xml format

src/ports/SkFontConfigParser_android.h

 /*
  * Copyright 2011 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.
  */
 
 #ifndef SKFONTCONFIGPARSER_ANDROID_H_
 #define SKFONTCONFIGPARSER_ANDROID_H_
 
 #include "SkTypes.h"
 
 #include "SkPaintOptionsAndroid.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 
 struct FontFileInfo {
     FontFileInfo() : fIndex(0) { }
 
     SkString              fFileName;
     int                   fIndex;
     SkPaintOptionsAndroid fPaintOptions;
+    int weight; // only used internally by SkFontConfigParser in LMP+

[djsollen, 2014/08/05 17:46:15]

fWeight instead of weight.  Also why is it internal only?  Can't we use it
externally in future versions of our font manager?

[tomhudson, 2014/08/05 19:35:35]

Done.

 };
 
 /**
  * The FontFamily data structure is created during parsing and handed back to
  * Skia to fold into its representation of font families. fNames is the list of
  * font names that alias to a font family. fontFileArray is the list of information
  * about each file.  Order is the priority order for the font. This is
  * used internally to determine the order in which to place fallback fonts as
  * they are read from the configuration files.
  */
 struct FontFamily {
-    FontFamily() : fIsFallbackFont(false), order(-1) {}
+    FontFamily() : fIsFallbackFont(false), order(-1),
+                   variant(SkPaintOptionsAndroid::kDefault_Variant) {}
 
     SkTArray<SkString> fNames;
     SkTArray<FontFileInfo> fFontFiles;
+    SkString language; // only used internally by SkFontConfigParser in LMP+

[djsollen, 2014/08/05 17:46:15]

If we made this an SkLanguage param then I don't see why we would need to say
that it is internal only.  When I've been reading over this code I think that it
is odd that we get SkLanguage and FontVariant from the individual font files and
not the family.

I would like to see both fLanguage and fVariant be first class members on this
struct, not just internal only. 

[tomhudson, 2014/08/05 19:35:35]

PS2 has fLanguage and fVariant, but missed the SkString -> SkLanguage change.

     bool fIsFallbackFont;
     int order; // only used internally by SkFontConfigParser
+    SkPaintOptionsAndroid::FontVariant variant;
+        // only used internally by SkFontConfigParser in LMP+
 };
 
 namespace SkFontConfigParser {
 
 /**
  * Parses all system font configuration files and returns the results in an
  * array of FontFamily structures.
  */
 void GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies);
 
 /**
  * Parses all test font configuration files and returns the results in an
  * array of FontFamily structures.
  */
 void GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies,
                          const char* testMainConfigFile,
                          const char* testFallbackConfigFile);
 
 SkString GetLocale();
 
 } // SkFontConfigParser namespace
 
 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */