From 592273965a7fc7fc403252e420d15f6555b8f25d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 26 Sep 2017 09:46:08 -0400 Subject: 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 Commit-Queue: Mike Reed --- tests/TypefaceTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/TypefaceTest.cpp') diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index f7660bd2f0..415d64abb1 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -109,7 +109,7 @@ DEF_TEST(TypefaceAxes, reporter) { SkFontArguments params; params.setVariationDesignPosition({position, SK_ARRAY_COUNT(position)}); // TODO: if axes are set and the back-end doesn't support them, should we create the typeface? - sk_sp typeface(fm->createFromStream(distortable.release(), params)); + sk_sp typeface = fm->makeFromStream(std::move(distortable), params); int count = typeface->getVariationDesignPosition(nullptr, 0); if (count == -1) { @@ -140,7 +140,7 @@ DEF_TEST(TypefaceVariationIndex, reporter) { SkFontArguments params; // The first named variation position in Distortable is 'Thin'. params.setCollectionIndex(0x00010000); - sk_sp typeface(fm->createFromStream(distortable.release(), params)); + sk_sp typeface = fm->makeFromStream(std::move(distortable), params); if (!typeface) { // FreeType is the only weird thing that supports this, Skia just needs to make sure if it // gets one of these things make sense. -- cgit v1.2.3