| Index: include/ports/SkFontMgr.h
|
| diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h
|
| index 28e374f753b8c0ba4873d0648ca5f99fee4f910f..afadeaaa9785fe55f4f7ce686878d5487aed8c0f 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;
|
|
|