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 /tests/TypefaceTest.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 'tests/TypefaceTest.cpp')
| -rw-r--r-- | tests/TypefaceTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<SkTypeface> typeface(fm->createFromStream(distortable.release(), params)); + sk_sp<SkTypeface> 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<SkTypeface> typeface(fm->createFromStream(distortable.release(), params)); + sk_sp<SkTypeface> 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. |