Font variations.

src/ports/SkFontMgr_fontconfig.cpp

Index: src/ports/SkFontMgr_fontconfig.cpp
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index a0e45facf6b88c67dbb64d84fb2f07d0e7cbe261..3e2974660d2a7e65dc824c828f43141366541254 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -387,7 +387,7 @@ public:
     }
 
     void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const SK_OVERRIDE {
-        desc->setFontIndex(fIndex);
+        desc->getFontParameters().fIndex = fIndex;
         *serialize = true;
     }
 
@@ -396,6 +396,13 @@ public:
         return fStream->duplicate();
     }
 
+    SkStreamAsset* onOpenStream2(SkFontParameters* fontParams) const SK_OVERRIDE {

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

Temporary implementation to just muck about with this on the desktop (where it's
faster to iterate). Unfortunately, FontConfig doesn't really support axes at
all.

+        fontParams->fIndex = fIndex;
+        fontParams->fAxis.reset(1);
+        fontParams->fAxis[0] = SK_Fixed1;
+        return fStream->duplicate();
+    };
+
 private:
     SkAutoTDelete<SkStreamAsset> fStream;
     int fIndex;
@@ -421,7 +428,7 @@ public:
         desc->setFullName(get_string(fPattern, FC_FULLNAME));
         desc->setPostscriptName(get_string(fPattern, FC_POSTSCRIPT_NAME));
         desc->setFontFileName(get_string(fPattern, FC_FILE));
-        desc->setFontIndex(get_int(fPattern, FC_INDEX, 0));
+        desc->getFontParameters().fIndex = get_int(fPattern, FC_INDEX, 0);
         *serialize = false;
     }