diff options
| author |  bungeman <bungeman@google.com> | 2016-04-13 05:23:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-13 05:23:35 -0700 |
| commit | ed2edabd07086bbf60df17ca0bf52d8ba49f2273 (patch) | |
| tree | d14257caf9d2775bcff4132eb8195d68a7d07576 /src/core/SkTypeface.cpp | |
| parent | dada4dd9cf03e42369ca5b38086dba77f01a68e6 (diff) | |
Remove SK_VERY_LEGACY_CREATE_TYPEFACE.
The flag and code it guards are no longer used.
TBR=reed
This just removes dead code.
Review URL: https://codereview.chromium.org/1882803002
Diffstat (limited to 'src/core/SkTypeface.cpp')
| -rw-r--r-- | src/core/SkTypeface.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index f9e5b5f43b..07b1467360 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -87,11 +87,7 @@ SkTypeface* SkTypeface::GetDefaultTypeface(Style style) { SkAutoMutexAcquire lock(&gCreateDefaultMutex); SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault()); -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - SkTypeface* t = fm->legacyCreateTypeface(nullptr, style); -#else SkTypeface* t = fm->legacyCreateTypeface(nullptr, SkFontStyle::FromOldStyle(style)); -#endif return t ? t : SkEmptyTypeface::Create(); }); } @@ -124,11 +120,7 @@ SkTypeface* SkTypeface::CreateFromName(const char name[], Style style) { return RefDefault(style); } SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault()); -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE - return fm->legacyCreateTypeface(name, style); -#else return fm->legacyCreateTypeface(name, SkFontStyle::FromOldStyle(style)); -#endif } SkTypeface* SkTypeface::CreateFromTypeface(const SkTypeface* family, Style s) { |