commit 592273965a7fc7fc403252e420d15f6555b8f25d
author Mike Reed <reed@google.com> Tue Sep 26 09:46:08 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 26 14:05:18 2017 +0000
tree 9d5f6fa74228b81278bc97af1dc78d9587d63c08
parent f6f7cf60985d8e109cc136f25e2a3c3383ca05ea

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>

tools/sk_tool_utils_font.cpp

diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp
index bdd88d0..4d82368 100644
--- a/tools/sk_tool_utils_font.cpp
+++ b/tools/sk_tool_utils_font.cpp
@@ -48,7 +48,7 @@
             // 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];