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
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index 8c943d1..7304cfb 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -126,11 +126,6 @@
@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 @@
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 @@
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,
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index dfa5bd0..536768a 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -101,11 +101,6 @@
virtual sk_sp<SkTypeface> makeTypeface(const FontIdentity& identity) {
return SkTypeface::MakeFromStream(this->openStream(identity), identity.fTTCIndex);
}
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
- virtual SkTypeface* createTypeface(const FontIdentity& identity) {
- return this->makeTypeface(identity).release();
- }
-#endif
/**
* Return a singleton instance of a direct subclass that calls into