@@ -37,7 +37,7 @@ AssetFontStyleSet* AssetDataProvider::MatchFamily(
   if (found == registered_families_.end()) {
     return nullptr;
   }
-  return &found->second;
+  return SkRef(&found->second);
 }
 
 void AssetDataProvider::RegisterTypeface(sk_sp<SkTypeface> typeface) {
 
@@ -31,7 +31,7 @@ SkTypeface* AssetFontStyleSet::createTypeface(int index) {
   if (index_cast >= typefaces_.size()) {
     return nullptr;
   }
-  return typefaces_[index_cast].get();
+  return SkRef(typefaces_[index_cast].get());
 }
 
 SkTypeface* AssetFontStyleSet::matchStyle(const SkFontStyle& pattern) {
@@ -42,7 +42,7 @@ SkTypeface* AssetFontStyleSet::matchStyle(const SkFontStyle& pattern) {
     if (typeface->fontStyle() == pattern)
       return typeface.get();
 
-  return typefaces_[0].get();
+  return SkRef(typefaces_[0].get());
 }
 
 }  // namespace txt
@@ -100,7 +100,7 @@ FontCollection::GetMinikinFontCollectionForFamily(const std::string& family) {
   }
 
   for (sk_sp<SkFontMgr>& manager : GetFontManagerOrder()) {
-    auto font_style_set = manager->matchFamily(family.c_str());
+    sk_sp<SkFontStyleSet> font_style_set(manager->matchFamily(family.c_str()));
     if (font_style_set == nullptr || font_style_set->count() == 0) {
       continue;
     }
@@ -111,8 +111,8 @@ FontCollection::GetMinikinFontCollectionForFamily(const std::string& family) {
     for (int i = 0, style_count = font_style_set->count(); i < style_count;
          ++i) {
       // Create the skia typeface.
-      auto skia_typeface =
-          sk_ref_sp<SkTypeface>(font_style_set->createTypeface(i));
+      sk_sp<SkTypeface> skia_typeface(
+          sk_sp<SkTypeface>(font_style_set->createTypeface(i)));
       if (skia_typeface == nullptr) {
         continue;
       }
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ AssetFontStyleSet* AssetDataProvider::MatchFamily(`
`37`	`37`	`if (found == registered_families_.end()) {`
`38`	`38`	`return nullptr;`
`39`	`39`	`}`
`40`		`- return &found->second;`
	`40`	`+ return SkRef(&found->second);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`void AssetDataProvider::RegisterTypeface(sk_sp<SkTypeface> typeface) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ SkTypeface* AssetFontStyleSet::createTypeface(int index) {`
`31`	`31`	`if (index_cast >= typefaces_.size()) {`
`32`	`32`	`return nullptr;`
`33`	`33`	`}`
`34`		`- return typefaces_[index_cast].get();`
	`34`	`+ return SkRef(typefaces_[index_cast].get());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`SkTypeface* AssetFontStyleSet::matchStyle(const SkFontStyle& pattern) {`
`@@ -42,7 +42,7 @@ SkTypeface* AssetFontStyleSet::matchStyle(const SkFontStyle& pattern) {`
`42`	`42`	`if (typeface->fontStyle() == pattern)`
`43`	`43`	`return typeface.get();`
`44`	`44`
`45`		`- return typefaces_[0].get();`
	`45`	`+ return SkRef(typefaces_[0].get());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`} // namespace txt`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ FontCollection::GetMinikinFontCollectionForFamily(const std::string& family) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`for (sk_sp<SkFontMgr>& manager : GetFontManagerOrder()) {`
`103`		`- auto font_style_set = manager->matchFamily(family.c_str());`
	`103`	`+ sk_sp<SkFontStyleSet> font_style_set(manager->matchFamily(family.c_str()));`
`104`	`104`	`if (font_style_set == nullptr \|\| font_style_set->count() == 0) {`
`105`	`105`	`continue;`
`106`	`106`	`}`
`@@ -111,8 +111,8 @@ FontCollection::GetMinikinFontCollectionForFamily(const std::string& family) {`
`111`	`111`	`for (int i = 0, style_count = font_style_set->count(); i < style_count;`
`112`	`112`	`++i) {`
`113`	`113`	`// Create the skia typeface.`
`114`		`- auto skia_typeface =`
`115`		`- sk_ref_sp<SkTypeface>(font_style_set->createTypeface(i));`
	`114`	`+ sk_sp<SkTypeface> skia_typeface(`
	`115`	`+ sk_sp<SkTypeface>(font_style_set->createTypeface(i)));`
`116`	`116`	`if (skia_typeface == nullptr) {`
`117`	`117`	`continue;`
`118`	`118`	`}`