diff options
author | 2016-11-07 11:47:44 -0500 | |
---|---|---|
committer | 2016-11-07 17:22:19 +0000 | |
commit | 67b39de70fb5d10caebfc75f418754186e5226c3 (patch) | |
tree | 53a773248fb4dbc02bdf71c89e9619398c5f2f95 /src/ports/SkFontMgr_android.cpp | |
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/ports/SkFontMgr_android.cpp')
-rw-r--r-- | src/ports/SkFontMgr_android.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 3a84ecad8b..116bc01549 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -237,7 +237,7 @@ public: } private: - SkTArray<SkAutoTUnref<SkTypeface_AndroidSystem>, true> fStyles; + SkTArray<sk_sp<SkTypeface_AndroidSystem>, true> fStyles; friend struct NameToFamily; friend class SkFontMgr_Android; @@ -323,7 +323,7 @@ protected: virtual SkTypeface* onMatchFamilyStyle(const char familyName[], const SkFontStyle& style) const override { - SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName)); + sk_sp<SkFontStyleSet> sset(this->matchFamily(familyName)); return sset->matchStyle(style); } @@ -331,7 +331,7 @@ protected: const SkFontStyle& style) const override { for (int i = 0; i < fStyleSets.count(); ++i) { for (int j = 0; j < fStyleSets[i]->fStyles.count(); ++j) { - if (fStyleSets[i]->fStyles[j] == typeface) { + if (fStyleSets[i]->fStyles[j].get() == typeface) { return fStyleSets[i]->matchStyle(style); } } |