diff options
| author |  bungeman <bungeman@google.com> | 2016-05-12 10:09:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 10:09:31 -0700 |
| commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 (patch) | |
| tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba /src/ports/SkFontMgr_android.cpp | |
| parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 (diff) | |
Move SkTypeface to sk_sp.
Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 4aea047cde..2e619af0fb 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -364,14 +364,14 @@ protected: return nullptr; } - static SkTypeface_AndroidSystem* find_family_style_character( + static sk_sp<SkTypeface_AndroidSystem> find_family_style_character( const SkTDArray<NameToFamily>& fallbackNameToFamilyMap, const SkFontStyle& style, bool elegant, const SkString& langTag, SkUnichar character) { for (int i = 0; i < fallbackNameToFamilyMap.count(); ++i) { SkFontStyleSet_Android* family = fallbackNameToFamilyMap[i].styleSet; - SkAutoTUnref<SkTypeface_AndroidSystem> face(family->matchStyle(style)); + sk_sp<SkTypeface_AndroidSystem> face(family->matchStyle(style)); if (!langTag.isEmpty() && !face->fLang.getTag().startsWith(langTag.c_str())) { continue; @@ -388,7 +388,7 @@ protected: uint16_t glyphID; paint.textToGlyphs(&character, sizeof(character), &glyphID); if (glyphID != 0) { - return face.release(); + return face; } } return nullptr; @@ -410,23 +410,23 @@ protected: for (int bcp47Index = bcp47Count; bcp47Index --> 0;) { SkLanguage lang(bcp47[bcp47Index]); while (!lang.getTag().isEmpty()) { - SkTypeface_AndroidSystem* matchingTypeface = + sk_sp<SkTypeface_AndroidSystem> matchingTypeface = find_family_style_character(fFallbackNameToFamilyMap, style, SkToBool(elegant), lang.getTag(), character); if (matchingTypeface) { - return matchingTypeface; + return matchingTypeface.release(); } lang = lang.getParent(); } } - SkTypeface_AndroidSystem* matchingTypeface = + sk_sp<SkTypeface_AndroidSystem> matchingTypeface = find_family_style_character(fFallbackNameToFamilyMap, style, SkToBool(elegant), SkString(), character); if (matchingTypeface) { - return matchingTypeface; + return matchingTypeface.release(); } } return nullptr; |