Font variations.

include/ports/SkFontMgr.h

Index: include/ports/SkFontMgr.h
diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h
index 4dde920085cb7da8dba2e860dba7d45550aab230..3cfbfd06eee5435d343d817cf5e2db111653c08a 100644
--- a/include/ports/SkFontMgr.h
+++ b/include/ports/SkFontMgr.h
@@ -12,6 +12,7 @@
 #include "SkFontStyle.h"
 
 class SkData;
+class SkFontParameters;
 class SkStreamAsset;
 class SkString;
 class SkTypeface;
@@ -112,6 +113,9 @@ public:
     static SkFontMgr* RefDefault();
 
 protected:
+    friend class SkTypeface;
+    SkTypeface* createFromStream(SkStreamAsset*, const SkFontParameters&) const;
+
     virtual int onCountFamilies() const = 0;
     virtual void onGetFamilyName(int index, SkString* familyName) const = 0;
     virtual SkFontStyleSet* onCreateStyleSet(int index)const  = 0;
@@ -129,6 +133,7 @@ protected:
 
     virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const = 0;
     virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0;
+    virtual SkTypeface* onCreateFromStream(SkStreamAsset*, const SkFontParameters&) const;
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0;
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],