Parser for new fonts.xml format

src/ports/SkFontConfigParser_android.h

Index: src/ports/SkFontConfigParser_android.h
diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h
index 8119fd7558e396161b89c9ba970df541cb133222..e03b1233a59ea3d3666f9262fdd5a7659bfd0557 100644
--- a/src/ports/SkFontConfigParser_android.h
+++ b/src/ports/SkFontConfigParser_android.h
@@ -20,6 +20,7 @@ struct FontFileInfo {
     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.

 };
 
 /**
@@ -31,12 +32,16 @@ struct FontFileInfo {
  * 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 {