diff options
| author |  Mike Reed <reed@google.com> | 2017-09-26 09:46:08 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-26 14:05:18 +0000 |
| commit | 592273965a7fc7fc403252e420d15f6555b8f25d (patch) | |
| tree | 9d5f6fa74228b81278bc97af1dc78d9587d63c08 /tools | |
| parent | f6f7cf60985d8e109cc136f25e2a3c3383ca05ea (diff) | |
Revert "Revert "migrate to sk_sp for SkFontMgr API""
This reverts commit f40ae1a4b5365620463bd63b5140bd3fc78894a1.
Bug: skia:
Change-Id: I752606de92ea405d6e50219c98030409b00a2841
Reviewed-on: https://skia-review.googlesource.com/51160
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sk_tool_utils_font.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp index bdd88d07f9..4d82368520 100644 --- a/tools/sk_tool_utils_font.cpp +++ b/tools/sk_tool_utils_font.cpp @@ -48,7 +48,7 @@ sk_sp<SkTypeface> create_font(const char* name, SkFontStyle style) { // If we called SkTypeface::CreateFromName() here we'd recurse infinitely, // so we reimplement its core logic here inline without the recursive aspect. sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault()); - return sk_sp<SkTypeface>(fm->legacyCreateTypeface(name, style)); + return fm->legacyMakeTypeface(name, style); } } else { sub = &gSubFonts[gDefaultFontIndex]; |