diff options
author | Ben Wagner <bungeman@google.com> | 2017-01-11 13:54:39 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 19:50:14 +0000 |
commit | 20d031a6ad7853eec166a4a648c09b12e4f32008 (patch) | |
tree | 0bb75cd2b3e1e18e87641894123308f609d6f606 /src/ports/SkFontHost_mac.cpp | |
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 'src/ports/SkFontHost_mac.cpp')
-rw-r--r-- | src/ports/SkFontHost_mac.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index ce4895419f..3e3887b4a7 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -2380,10 +2380,6 @@ protected: /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_LEGACY_FONTMGR_FACTORY -SkFontMgr* SkFontMgr::Factory() { return new SkFontMgr_Mac; } -#else sk_sp<SkFontMgr> SkFontMgr::Factory() { return sk_make_sp<SkFontMgr_Mac>(); } -#endif #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) |