| Index: include/core/SkTypeface.h
|
| diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
|
| index 0fbf6a3e0ad337395c66f513e73eb6a37f61e8f2..19e8f2f946dd7c951921bf5c08931a0b1036b310 100644
|
| --- a/include/core/SkTypeface.h
|
| +++ b/include/core/SkTypeface.h
|
| @@ -97,6 +97,7 @@ public:
|
| * when they are done referencing the object. Never returns NULL.
|
| */
|
| static SkTypeface* RefDefault(Style style = SkTypeface::kNormal);
|
| + static SkTypeface* RefDefault(SkFontStyle style);
|
|
|
| /** Return a new reference to the typeface that most closely matches the
|
| requested familyName and style. Pass null as the familyName to return
|
| @@ -108,6 +109,8 @@ public:
|
| unref() when they are done.
|
| */
|
| static SkTypeface* CreateFromName(const char familyName[], Style style);
|
| + static SkTypeface* CreateFromName(const char familyName[],
|
| + SkFontStyle style);
|
|
|
| /** Return a new reference to the typeface that most closely matches the
|
| requested typeface and specified Style. Use this call if you want to
|
| @@ -334,6 +337,7 @@ protected:
|
|
|
| friend class SkScalerContext;
|
| static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal);
|
| + static SkTypeface* GetDefaultTypeface(SkFontStyle style);
|
|
|
| virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
|
| const SkDescriptor*) const = 0;
|
|
|