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 /gm/fontmgr.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 'gm/fontmgr.cpp')
| -rw-r--r-- | gm/fontmgr.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 18fc1d9250..cd596ebac7 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -55,21 +55,6 @@ static const char* ja = "ja"; class FontMgrGM : public skiagm::GM { public: -#ifdef SK_LEGACY_FONTMGR_FACTORY - FontMgrGM(SkFontMgr* fontMgr = nullptr) { - SkGraphics::SetFontCacheLimit(16 * 1024 * 1024); - - fName.set("fontmgr_iter"); - if (fontMgr) { - fName.append("_factory"); - fFM.reset(fontMgr); - } else { - fFM.reset(SkFontMgr::RefDefault()); - } - fName.append(sk_tool_utils::platform_os_name()); - fName.append(sk_tool_utils::platform_extra_config("GDI")); - } -#else FontMgrGM(sk_sp<SkFontMgr> fontMgr = nullptr) { SkGraphics::SetFontCacheLimit(16 * 1024 * 1024); @@ -83,7 +68,6 @@ public: fName.append(sk_tool_utils::platform_os_name()); fName.append(sk_tool_utils::platform_extra_config("GDI")); } -#endif protected: SkString onShortName() override { @@ -241,11 +225,7 @@ public: } fName.append(sk_tool_utils::platform_os_name()); fName.append(sk_tool_utils::platform_extra_config("GDI")); -#ifdef SK_LEGACY_FONTMGR_FACTORY - fFM.reset(SkFontMgr::RefDefault()); -#else fFM = SkFontMgr::RefDefault(); -#endif } static void show_bounds(SkCanvas* canvas, const SkPaint& paint, SkScalar x, SkScalar y, |