diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-07 11:47:44 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 17:22:19 +0000 |
| commit | 67b39de70fb5d10caebfc75f418754186e5226c3 (patch) | |
| tree | 53a773248fb4dbc02bdf71c89e9619398c5f2f95 /src/fonts | |
| parent | 09c85a53c370325d4e8646e34be7684728a1f375 (diff) | |
s/SkAutoTUnref/sk_sp/ in src/ part 1
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4480
Change-Id: I7d3219b02ad5094785e1b7635a9482e69aadbc8c
Reviewed-on: https://skia-review.googlesource.com/4480
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkFontMgr_indirect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 41447ac995..f594e2d888 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -55,9 +55,9 @@ public: return this->matchStyleCSS3(pattern); } private: - SkAutoTUnref<const SkFontMgr_Indirect> fOwner; + sk_sp<const SkFontMgr_Indirect> fOwner; int fFamilyIndex; - SkAutoTUnref<SkRemotableFontIdentitySet> fData; + sk_sp<SkRemotableFontIdentitySet> fData; }; void SkFontMgr_Indirect::set_up_family_names(const SkFontMgr_Indirect* self) { @@ -97,7 +97,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i SkAutoMutexAcquire ama(fDataCacheMutex); - SkAutoTUnref<SkTypeface> dataTypeface; + sk_sp<SkTypeface> dataTypeface; int dataTypefaceIndex = 0; for (int i = 0; i < fDataCache.count(); ++i) { const DataEntry& entry = fDataCache[i]; @@ -135,7 +135,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i return nullptr; } - SkAutoTUnref<SkTypeface> typeface(fImpl->createFromStream(stream.release(), id.fTtcIndex)); + sk_sp<SkTypeface> typeface(fImpl->createFromStream(stream.release(), id.fTtcIndex)); if (typeface.get() == nullptr) { return nullptr; } @@ -186,7 +186,7 @@ SkTypeface* SkFontMgr_Indirect::onCreateFromData(SkData* data, int ttcIndex) con SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const { - SkAutoTUnref<SkTypeface> face(this->matchFamilyStyle(familyName, style)); + sk_sp<SkTypeface> face(this->matchFamilyStyle(familyName, style)); if (nullptr == face.get()) { face.reset(this->matchFamilyStyle(nullptr, style)); |