Font variations.

src/core/SkFontDescriptor.h

Index: src/core/SkFontDescriptor.h
diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h
index 13f9cb7257d8abdc023685face5dac6f4ed0004d..b297df6d7752e2a39e76304cd1909f5f13226352 100644
--- a/src/core/SkFontDescriptor.h
+++ b/src/core/SkFontDescriptor.h
@@ -12,6 +12,13 @@
 #include "SkString.h"
 #include "SkTypeface.h"
 
+class SkFontParameters {

[bungeman-skia, 2015/03/23 21:59:05]

So this class is pragmatic, but also represents the odd rift (which FontConfig
ignores) between font request properties (properties of a font request like
name, style, characters, language), and extended font properties (information in
addition to the font data which is needed to define the font like index, axis,
extra scale, extra matrix, synthetic attributes).

The SkFontDescriptor wants to be able to represent both, so it almost seems like
it wants to be two parts. The SkTypeface base class knows everything about the
font request, but it's up to the subclasses to know about font parameters. The
font paramaters would also always need to ride with the data, so maybe this
should also have the data on it and the 'openStream' return one of these as a
whole package.

The implementation of this is also currently an ugly hack, just to get things
working. Needs to be cleaned up.

+public:
+    SkFontParameters() : fIndex(0) { }
+    int fIndex;
+    SkAutoSTArray<4, SkFixed> fAxis;
+};
+
 class SkFontDescriptor {
 public:
     SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal);
@@ -30,7 +37,7 @@ public:
     bool hasFontData() const { return fFontData.get() != NULL; }
     // Transfers ownership to the caller.
     SkStreamAsset* transferFontData() { return fFontData.detach(); }
-    int getFontIndex() const { return fFontIndex; }
+    SkFontParameters& getFontParameters() { return fFontParameters; }
 
     void setFamilyName(const char* name) { fFamilyName.set(name); }
     void setFullName(const char* name) { fFullName.set(name); }
@@ -40,7 +47,6 @@ public:
      *  This method takes ownership of the stream (both reference and cursor).
      */
     void setFontData(SkStreamAsset* stream) { fFontData.reset(stream); }
-    void setFontIndex(int index) { fFontIndex = index; }
 
 private:
     SkString fFamilyName;
@@ -48,7 +54,7 @@ private:
     SkString fPostscriptName;
     SkString fFontFileName;
     SkAutoTDelete<SkStreamAsset> fFontData;
-    int fFontIndex;
+    SkFontParameters fFontParameters;
 
     SkTypeface::Style fStyle;
 };