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 /gm/coloremoji.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 'gm/coloremoji.cpp')
-rw-r--r-- | gm/coloremoji.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index ebb3c6715c..b29040ac29 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -50,11 +50,11 @@ public: protected: struct EmojiFont { - SkAutoTUnref<SkTypeface> typeface; + sk_sp<SkTypeface> typeface; const char* text; } emojiFont; virtual void onOnceBeforeDraw() override { - sk_tool_utils::emoji_typeface(&emojiFont.typeface); + emojiFont.typeface = sk_tool_utils::emoji_typeface(); emojiFont.text = sk_tool_utils::emoji_sample_text(); } @@ -92,7 +92,7 @@ protected: for (int makeBlur = 0; makeBlur < 2; makeBlur++) { for (int makeGray = 0; makeGray < 2; makeGray++) { SkPaint shaderPaint; - shaderPaint.setTypeface(paint.getTypeface()); + shaderPaint.setTypeface(sk_ref_sp(paint.getTypeface())); if (SkToBool(makeLinear)) { shaderPaint.setShader(MakeLinear()); } |