From 4bf296be2821d2bdd0afabae9fdfe18e7e9b59cb Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 25 Sep 2017 13:21:45 -0400 Subject: migrate to sk_sp for SkFontMgr API Bug: skia: Change-Id: I1bf2a13537f67938cdc9956080065d10ea0bd1d8 Reviewed-on: https://skia-review.googlesource.com/48740 Commit-Queue: Ben Wagner Reviewed-by: Ben Wagner --- src/fonts/SkFontMgr_indirect.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/fonts') diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index c04c2b851d..98889b6abd 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -111,7 +111,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i if (dataTypeface.get() != nullptr) { std::unique_ptr stream(dataTypeface->openStream(nullptr)); if (stream.get() != nullptr) { - return fImpl->createFromStream(stream.release(), dataTypefaceIndex); + return fImpl->makeFromStream(std::move(stream), dataTypefaceIndex).release(); } } @@ -121,7 +121,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i return nullptr; } - sk_sp typeface(fImpl->createFromStream(stream.release(), id.fTtcIndex)); + sk_sp typeface(fImpl->makeFromStream(std::move(stream), id.fTtcIndex)); if (typeface.get() == nullptr) { return nullptr; } @@ -158,20 +158,21 @@ SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember, return this->matchFamilyStyle(familyName.c_str(), fontStyle); } -SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const { - return fImpl->createFromStream(stream, ttcIndex); +sk_sp SkFontMgr_Indirect::onMakeFromStreamIndex(std::unique_ptr stream, + int ttcIndex) const { + return fImpl->makeFromStream(std::move(stream), ttcIndex); } -SkTypeface* SkFontMgr_Indirect::onCreateFromFile(const char path[], int ttcIndex) const { - return fImpl->createFromFile(path, ttcIndex); +sk_sp SkFontMgr_Indirect::onMakeFromFile(const char path[], int ttcIndex) const { + return fImpl->makeFromFile(path, ttcIndex); } -SkTypeface* SkFontMgr_Indirect::onCreateFromData(SkData* data, int ttcIndex) const { - return fImpl->createFromData(data, ttcIndex); +sk_sp SkFontMgr_Indirect::onMakeFromData(sk_sp data, int ttcIndex) const { + return fImpl->makeFromData(std::move(data), ttcIndex); } -SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[], - SkFontStyle style) const { +sk_sp SkFontMgr_Indirect::onLegacyMakeTypeface(const char familyName[], + SkFontStyle style) const { sk_sp face(this->matchFamilyStyle(familyName, style)); if (nullptr == face.get()) { @@ -183,5 +184,5 @@ SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[], face.reset(this->createTypefaceFromFontId(fontId)); } - return face.release(); + return face; } -- cgit v1.2.3