Font variations.

include/ports/SkFontMgr.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkFontStyle.h"
 
 class SkData;
+class SkFontParameters;
 class SkStreamAsset;
 class SkString;
 class SkTypeface;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkFontStyleSet)
 
     virtual int count() = 0;
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
@@ skipping 80 matching lines @@
     SkTypeface* legacyCreateTypeface(const char familyName[],
                                      unsigned typefaceStyleBits) const;
 
     /**
      *  Return a ref to the default fontmgr. The caller must call unref() on
      *  the returned object.
      */
     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;
 
     /** May return NULL if the name is not found. */
     virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const = 0;
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle&) const = 0;
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
                                                     const char* bcp47[], int bcp47Count,
                                                     SkUnichar character) const = 0;
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
                                          const SkFontStyle&) const = 0;
 
     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[],
                                                unsigned styleBits) const = 0;
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
     friend SkFontMgr* sk_fontmgr_create_default();
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif