diff options
author | 2017-01-11 13:54:39 -0500 | |
---|---|---|
committer | 2017-01-11 19:50:14 +0000 | |
commit | 20d031a6ad7853eec166a4a648c09b12e4f32008 (patch) | |
tree | 0bb75cd2b3e1e18e87641894123308f609d6f606 /include/ports/SkFontMgr_android.h | |
parent | d50fd8c18989fd4209dbfe40d24e5060c04f6d8c (diff) |
Remove SK_LEGACY_FONTMGR_FACTORY.
SkFontMgr factories now return sk_sp and the legacy factories are no
longer used and can be removed.
BUG=skia:5077
Change-Id: Ieaff8555b297d1db157f8b78cdd6e7d07a3b5490
Reviewed-on: https://skia-review.googlesource.com/6894
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include/ports/SkFontMgr_android.h')
-rw-r--r-- | include/ports/SkFontMgr_android.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/ports/SkFontMgr_android.h b/include/ports/SkFontMgr_android.h index ee73a4b717..e1a8fecb97 100644 --- a/include/ports/SkFontMgr_android.h +++ b/include/ports/SkFontMgr_android.h @@ -40,10 +40,6 @@ struct SkFontMgr_Android_CustomFonts { }; /** Create a font manager for Android. If 'custom' is NULL, use only system fonts. */ -#ifdef SK_LEGACY_FONTMGR_FACTORY -SK_API SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom); -#else SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom); -#endif #endif // SkFontMgr_android_DEFINED |