commit bfe44b6974c90f472bceeeab29faf77b1b481057
author Ben Wagner <bungeman@google.com> Wed Jun 03 22:14:28 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 04 13:46:10 2020 +0000
tree 47dcd304691cd109234598ce186a4501d9626adb
parent c3320be506a0823fe258e08d8457bcceee8eebef

Don't leak ref returned by SkFontMgr::matchFamilyStyle.

The current code does an extra ref on the SkTypeface returned from
SkFontMgr::matchFamilyStyle. This old API needs to be updated to return
sk_sp<SkTypeface> instead of a ref'ed bare SkTypeface*.

Bug: skia:10325
Change-Id: I191b494fb86b99fc53b6eb850d65ba73e60dc489
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294038
Auto-Submit: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>

modules/skparagraph/src/FontCollection.cpp

diff --git a/modules/skparagraph/src/FontCollection.cpp b/modules/skparagraph/src/FontCollection.cpp
index f26ec57..f5802df 100644
--- a/modules/skparagraph/src/FontCollection.cpp
+++ b/modules/skparagraph/src/FontCollection.cpp
@@ -131,8 +131,8 @@
     if (fDefaultFontManager == nullptr) {
         return nullptr;
     }
-    auto result = fDefaultFontManager->matchFamilyStyle(fDefaultFamilyName.c_str(), SkFontStyle());
-    return sk_ref_sp<SkTypeface>(result);
+    return sk_sp<SkTypeface>(fDefaultFontManager->matchFamilyStyle(fDefaultFamilyName.c_str(),
+                                                                   SkFontStyle()));
 }