| Index: gm/mixedtextblobs.cpp
|
| diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp
|
| index e66e73caf3f0915e95ad59ed8a5d7cb026cac72e..9a9bded1db097775791cfd9580528e97e71c4a0e 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;
|
|
|
|
|