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 /gm/mixedtextblobs.cpp | |
parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'gm/mixedtextblobs.cpp')
-rw-r--r-- | gm/mixedtextblobs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp index e66e73caf3..9a9bded1db 100644 --- a/gm/mixedtextblobs.cpp +++ b/gm/mixedtextblobs.cpp @@ -39,9 +39,9 @@ public: protected: void onOnceBeforeDraw() override { - sk_tool_utils::emoji_typeface(&fEmojiTypeface); + fEmojiTypeface = sk_tool_utils::emoji_typeface(); fEmojiText = sk_tool_utils::emoji_sample_text(); - fReallyBigATypeface.reset(GetResourceAsTypeface("/fonts/ReallyBigA.ttf")); + fReallyBigATypeface = MakeResourceAsTypeface("/fonts/ReallyBigA.ttf"); SkTextBlobBuilder builder; @@ -150,8 +150,8 @@ protected: } private: - SkAutoTUnref<SkTypeface> fEmojiTypeface; - SkAutoTUnref<SkTypeface> fReallyBigATypeface; + sk_sp<SkTypeface> fEmojiTypeface; + sk_sp<SkTypeface> fReallyBigATypeface; const char* fEmojiText; SkAutoTUnref<const SkTextBlob> fBlob; |