diff options
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); } } |