Index: gm/coloremoji.cpp |
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp |
index 029377e8e47a1d5d8f39f7d1732acbebf53073e1..8ef335a1586f0edf26f9aa52166053e3af9331e0 100644 |
--- a/gm/coloremoji.cpp |
+++ b/gm/coloremoji.cpp |
@@ -50,11 +50,11 @@ public: |
protected: |
struct EmojiFont { |
- SkTypeface* typeface; |
+ SkAutoTUnref<SkTypeface> typeface; |
const char* text; |
} emojiFont; |
virtual void onOnceBeforeDraw() override { |
- emojiFont.typeface = sk_tool_utils::emoji_typeface(); |
+ sk_tool_utils::emoji_typeface(&emojiFont.typeface); |
emojiFont.text = sk_tool_utils::emoji_sample_text(); |
} |
@@ -155,10 +155,6 @@ protected: |
} |
} |
-private: |
- SkAutoTUnref<SkTypeface> fCBDT_CBLC_Typeface; |
- SkAutoTUnref<SkTypeface> fSBIX_Typeface; |
- |
typedef GM INHERITED; |
}; |