| Index: gm/dftext.cpp
 | 
| diff --git a/gm/dftext.cpp b/gm/dftext.cpp
 | 
| index c7d9a8b1bf03231cc28a3e48b810815c833f1209..e6aba0894ed1b59693e423a07eb89046b8367be3 100644
 | 
| --- a/gm/dftext.cpp
 | 
| +++ b/gm/dftext.cpp
 | 
| @@ -19,7 +19,7 @@
 | 
|  
 | 
|  protected:
 | 
|      void onOnceBeforeDraw() override {
 | 
| -        fEmojiTypeface = sk_tool_utils::emoji_typeface();
 | 
| +        sk_tool_utils::emoji_typeface(&fEmojiTypeface);
 | 
|          fEmojiText = sk_tool_utils::emoji_sample_text();
 | 
|      }
 | 
|  
 | 
| @@ -210,7 +210,7 @@
 | 
|      }
 | 
|  
 | 
|  private:
 | 
| -    sk_sp<SkTypeface> fEmojiTypeface;
 | 
| +    SkAutoTUnref<SkTypeface> fEmojiTypeface;
 | 
|      const char* fEmojiText;
 | 
|  
 | 
|      typedef skiagm::GM INHERITED;
 | 
| 
 |