diff options
| author |  bungeman <bungeman@google.com> | 2016-05-11 12:38:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 12:38:18 -0700 |
| commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
| tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /src/ports/SkFontMgr_android.cpp | |
| parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) | |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 4aea047cde..3e6e0da18a 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -371,7 +371,7 @@ protected: { 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; @@ -387,9 +387,6 @@ protected: uint16_t glyphID; paint.textToGlyphs(&character, sizeof(character), &glyphID); - if (glyphID != 0) { - return face.release(); - } } return nullptr; } |