diff options
| author |  bungeman <bungeman@google.com> | 2016-06-03 14:35:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-03 14:35:06 -0700 |
| commit | 69df0206252ce0e6293c60274a1dfc363bb2e3b5 (patch) | |
| tree | e869a7dae57be17c24026e92118ecf03ac29a6a9 /include/core/SkTypeface.h | |
| parent | ab0bf2ef82cdfc92d6dbef2d9949be24a7b88533 (diff) | |
Remove some uses of SK_SUPPORT_LEGACY_TYPEFACE_PTR.
Some of the deprecated signatures are no longer used by any known
client, so remove them now to prevent future use.
TBR=reed
This doesn't add API, it just removes it.
Review-Url: https://codereview.chromium.org/2036993003
Diffstat (limited to 'include/core/SkTypeface.h')
| -rw-r--r-- | include/core/SkTypeface.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 8c943d199c..7304cfb82a 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -126,11 +126,6 @@ public: @return the closest-matching typeface. */ static sk_sp<SkTypeface> MakeFromTypeface(SkTypeface* family, Style); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* CreateFromTypeface(const SkTypeface* family, Style style) { - return MakeFromTypeface(const_cast<SkTypeface*>(family), style).release(); - } -#endif /** Return a new typeface given a file. If the file does not exist, or is not a valid font file, returns nullptr. @@ -158,11 +153,6 @@ public: transferred, so the caller must not reference it again. */ static sk_sp<SkTypeface> MakeFromFontData(SkFontData*); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* CreateFromFontData(SkFontData* fd) { - return MakeFromFontData(fd).release(); - } -#endif /** Write a unique signature to a stream, sufficient to reconstruct a typeface referencing the same font when Deserialize is called. @@ -175,11 +165,6 @@ public: Does not affect ownership of SkStream. */ static sk_sp<SkTypeface> MakeDeserialize(SkStream*); -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR - static SkTypeface* Deserialize(SkStream* stream) { - return MakeDeserialize(stream).release(); - } -#endif enum Encoding { kUTF8_Encoding, |