diff options
| -rw-r--r-- | include/core/SkTypeface.h | 3 | ||||
| -rw-r--r-- | include/ports/SkFontMgr.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index deaa7140e6..61618697e8 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -360,9 +360,6 @@ protected: virtual SkStreamAsset* onOpenStream(int* ttcIndex) const = 0; // TODO: make pure virtual. virtual std::unique_ptr<SkFontData> onMakeFontData() const; -#ifdef SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA - virtual SkFontData* onCreateFontData() const { return nullptr; }; -#endif virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0; diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h index 28e374f753..afadeaaa97 100644 --- a/include/ports/SkFontMgr.h +++ b/include/ports/SkFontMgr.h @@ -192,9 +192,6 @@ protected: // TODO: make pure virtual. virtual SkTypeface* onCreateFromStream(SkStreamAsset*, const FontParameters&) const; virtual SkTypeface* onCreateFromFontData(std::unique_ptr<SkFontData>) const; -#ifdef SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA - virtual SkTypeface* onCreateFromFontData(SkFontData*) const { return nullptr; }; -#endif virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const = 0; |