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/SkFontMgr_android.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/SkFontMgr_android.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index fe4a82d964..d4d7967dc5 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -535,11 +535,8 @@ static char const * const gSystemFontUseStrings[] = { "OnlyCustom", "PreferCustom", "PreferSystem" }; #endif -#ifdef SK_LEGACY_FONTMGR_FACTORY -SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) { -#else + sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) { -#endif if (custom) { SkASSERT(0 <= custom->fSystemFontUse); SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings)); @@ -549,9 +546,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust custom->fFontsXml, custom->fFallbackFontsXml)); } -#ifdef SK_LEGACY_FONTMGR_FACTORY - return new SkFontMgr_Android(custom); -#else return sk_make_sp<SkFontMgr_Android>(custom); -#endif } |