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 /gm/fontmgr.cpp | |
| 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 'gm/fontmgr.cpp')
| -rw-r--r-- | gm/fontmgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index 8d14e3a66d..9708d19978 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -46,8 +46,7 @@ static SkScalar drawCharacter(SkCanvas* canvas, uint32_t character, SkScalar x, // it expects to get the same glyph when following this pattern. SkString familyName; typeface->getFamilyName(&familyName); - paint.setTypeface(sk_sp<SkTypeface>(fm->legacyCreateTypeface(familyName.c_str(), - typeface->fontStyle()))); + paint.setTypeface(fm->legacyMakeTypeface(familyName.c_str(), typeface->fontStyle())); return drawString(canvas, ch, x, y, paint) + 20; } |