AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA.

Browse Source 
This is no longer defined by any users, so remove it.

TBR=reed
This just removes no longer used API.

Review-Url: https://codereview.chromium.org/2345353002
This commit is contained in:
bungeman 2016-09-16 14:54:16 -07:00 committed by Commit bot
parent c6c81e1ff8
commit 67ac33e1f1
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkTypeface.h
View File

@ -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;

3
include/ports/SkFontMgr.h
View File

@ -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;