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..513422d29b97254e43f7a99a99a634b39d605166 100644
--- a/src/ports/SkFontConfigParser_android.h
+++ b/src/ports/SkFontConfigParser_android.h
@@ -15,11 +15,12 @@
 #include "SkTDArray.h"
 
 struct FontFileInfo {
-    FontFileInfo() : fIndex(0) { }
+    FontFileInfo() : fIndex(0), fWeight(0) { }
 
     SkString              fFileName;
     int                   fIndex;
     SkPaintOptionsAndroid fPaintOptions;
+    int                   fWeight;
 };
 
 /**
@@ -31,12 +32,17 @@ struct FontFileInfo {
  * they are read from the configuration files.
  */
 struct FontFamily {
-    FontFamily() : fIsFallbackFont(false), order(-1) {}
+    FontFamily()
+        : fVariant(SkPaintOptionsAndroid::kDefault_Variant)
+        , order(-1)
+        , fIsFallbackFont(false) { }
 
-    SkTArray<SkString> fNames;
-    SkTArray<FontFileInfo> fFontFiles;
-    bool fIsFallbackFont;
-    int order; // only used internally by SkFontConfigParser
+    SkTArray<SkString>                 fNames;
+    SkTArray<FontFileInfo>             fFontFiles;
+    SkLanguage                         fLanguage;
+    SkPaintOptionsAndroid::FontVariant fVariant;
+    int                                order; // only used internally by SkFontConfigParser
+    bool                               fIsFallbackFont;
 };
 
 namespace SkFontConfigParser {