commit 6296da736fbf40aae881650c239420f64e576c3f
author bungeman <bungeman@google.com> Wed May 11 12:38:18 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 11 12:38:18 2016 -0700
tree 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89
parent c8699321b924c1f284df93cb29b86000c1d73c0a

Move SkTypeface to sk_sp.

Review-Url: https://codereview.chromium.org/1933393002

gm/mixedtextblobs.cpp

diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp
index e66e73c..9a9bded 100644
--- a/gm/mixedtextblobs.cpp
+++ b/gm/mixedtextblobs.cpp
@@ -39,9 +39,9 @@
 
 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 @@
     }
 
 private:
-    SkAutoTUnref<SkTypeface> fEmojiTypeface;
-    SkAutoTUnref<SkTypeface> fReallyBigATypeface;
+    sk_sp<SkTypeface> fEmojiTypeface;
+    sk_sp<SkTypeface> fReallyBigATypeface;
     const char* fEmojiText;
     SkAutoTUnref<const SkTextBlob> fBlob;