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 /src/fonts/SkFontMgr_indirect.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 'src/fonts/SkFontMgr_indirect.cpp')
-rw-r--r-- | src/fonts/SkFontMgr_indirect.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 98889b6abd..c04c2b851d 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<SkStreamAsset> stream(dataTypeface->openStream(nullptr)); if (stream.get() != nullptr) { - return fImpl->makeFromStream(std::move(stream), dataTypefaceIndex).release(); + return fImpl->createFromStream(stream.release(), dataTypefaceIndex); } } @@ -121,7 +121,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i return nullptr; } - sk_sp<SkTypeface> typeface(fImpl->makeFromStream(std::move(stream), id.fTtcIndex)); + sk_sp<SkTypeface> typeface(fImpl->createFromStream(stream.release(), id.fTtcIndex)); if (typeface.get() == nullptr) { return nullptr; } @@ -158,21 +158,20 @@ SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember, return this->matchFamilyStyle(familyName.c_str(), fontStyle); } -sk_sp<SkTypeface> SkFontMgr_Indirect::onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset> stream, - int ttcIndex) const { - return fImpl->makeFromStream(std::move(stream), ttcIndex); +SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const { + return fImpl->createFromStream(stream, ttcIndex); } -sk_sp<SkTypeface> SkFontMgr_Indirect::onMakeFromFile(const char path[], int ttcIndex) const { - return fImpl->makeFromFile(path, ttcIndex); +SkTypeface* SkFontMgr_Indirect::onCreateFromFile(const char path[], int ttcIndex) const { + return fImpl->createFromFile(path, ttcIndex); } -sk_sp<SkTypeface> SkFontMgr_Indirect::onMakeFromData(sk_sp<SkData> data, int ttcIndex) const { - return fImpl->makeFromData(std::move(data), ttcIndex); +SkTypeface* SkFontMgr_Indirect::onCreateFromData(SkData* data, int ttcIndex) const { + return fImpl->createFromData(data, ttcIndex); } -sk_sp<SkTypeface> SkFontMgr_Indirect::onLegacyMakeTypeface(const char familyName[], - SkFontStyle style) const { +SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[], + SkFontStyle style) const { sk_sp<SkTypeface> face(this->matchFamilyStyle(familyName, style)); if (nullptr == face.get()) { @@ -184,5 +183,5 @@ sk_sp<SkTypeface> SkFontMgr_Indirect::onLegacyMakeTypeface(const char familyName face.reset(this->createTypefaceFromFontId(fontId)); } - return face; + return face.release(); } |