diff options
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index c11b76135d..51d5a0b11c 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -95,11 +95,6 @@ public: /** Returns the default typeface, which is never nullptr. */ static sk_sp<SkTypeface> MakeDefault(Style style = SkTypeface::kNormal); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* RefDefault(Style style = SkTypeface::kNormal) { - return MakeDefault(style).release(); - } -#endif /** Creates a new reference to the typeface that most closely matches the requested familyName and fontStyle. This method allows extended font @@ -112,12 +107,6 @@ public: */ static sk_sp<SkTypeface> MakeFromName(const char familyName[], SkFontStyle fontStyle); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* CreateFromName(const char familyName[], Style style) { - return MakeFromName(familyName, SkFontStyle::FromOldStyle(style)).release(); - } -#endif - /** Return the typeface that most closely matches the requested typeface and style. Use this to pick a new style from the same family of the existing typeface. If family is nullptr, this selects from the default font's family. @@ -132,22 +121,12 @@ public: not a valid font file, returns nullptr. */ static sk_sp<SkTypeface> MakeFromFile(const char path[], int index = 0); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* CreateFromFile(const char path[], int index = 0) { - return MakeFromFile(path, index).release(); - } -#endif /** Return a new typeface given a stream. If the stream is not a valid font file, returns nullptr. Ownership of the stream is transferred, so the caller must not reference it again. */ static sk_sp<SkTypeface> MakeFromStream(SkStreamAsset* stream, int index = 0); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* CreateFromStream(SkStreamAsset* stream, int index = 0) { - return MakeFromStream(stream, index).release(); - } -#endif /** Return a new typeface given font data and configuration. If the data is not valid font data, returns nullptr. |