diff options
| author |  Mike Reed <reed@google.com> | 2017-09-25 20:00:31 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-25 20:00:41 +0000 |
| commit | f40ae1a4b5365620463bd63b5140bd3fc78894a1 (patch) | |
| tree | 3070160f98d80ea9e2ab53eb8b06035d70582701 /tests/TypefaceTest.cpp | |
| parent | a3ab53b93a40185d7f29409264f91b835ae8929e (diff) | |
Revert "migrate to sk_sp for SkFontMgr API"
This reverts commit 4bf296be2821d2bdd0afabae9fdfe18e7e9b59cb.
Reason for revert: need guard for flutter
Original change's description:
> migrate to sk_sp for SkFontMgr API
>
> Bug: skia:
> Change-Id: I1bf2a13537f67938cdc9956080065d10ea0bd1d8
> Reviewed-on: https://skia-review.googlesource.com/48740
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
TBR=bungeman@google.com,reed@google.com
Change-Id: Ib0b2d00fcbcdb6131444f94d1046df6dae24f551
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/50940
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 415d64abb1..f7660bd2f0 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->makeFromStream(std::move(distortable), params); + sk_sp<SkTypeface> typeface(fm->createFromStream(distortable.release(), 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->makeFromStream(std::move(distortable), params); + sk_sp<SkTypeface> typeface(fm->createFromStream(distortable.release(), 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. |