Move SkTypeface to sk_sp.

gm/textblobrandomfont.cpp

Index: gm/textblobrandomfont.cpp
diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp
index 267fe7a320c79e77d2b98434698d0cc4c44a066b..d5ee0dfb46ab8c436394d443faded75e72e9f971 100644
--- a/gm/textblobrandomfont.cpp
+++ b/gm/textblobrandomfont.cpp
@@ -39,12 +39,12 @@ protected:
         paint.setLCDRenderText(true);
 
         // Setup our random scaler context
-        SkAutoTUnref<SkTypeface> orig(sk_tool_utils::create_portable_typeface("sans-serif",
+        sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface("sans-serif",
                                                                               SkTypeface::kBold));
         if (nullptr == orig) {
-            orig.reset(SkTypeface::RefDefault());
+            orig = SkTypeface::MakeDefault();
         }
-        SkAutoTUnref<SkTypeface> random(new SkRandomTypeface(orig, paint, false));
+        sk_sp<SkTypeface> random(new SkRandomTypeface(orig, paint, false));
         paint.setTypeface(random);

[tomhudson, 2016/04/29 21:10:36]

Can inline sk_make_sp<SkRandomTypeface>(orig, paint, false) and not have the
local random?

(Like you did 30 lines later!)

[bungeman-skia, 2016/04/29 22:03:23]

Done.

 
         SkRect bounds;
@@ -66,16 +66,14 @@ protected:
         sk_tool_utils::add_to_text_blob(&builder, bigtext2, paint, 0, offset);
 
         // color emoji
-        SkAutoTUnref<SkTypeface> origEmoji;
-        sk_tool_utils::emoji_typeface(&origEmoji);
+        sk_sp<SkTypeface> origEmoji = sk_tool_utils::emoji_typeface();
         const char* osName = sk_tool_utils::platform_os_name();
         // The mac emoji string will break us
         if (origEmoji && (!strcmp(osName, "Android") || !strcmp(osName, "Ubuntu"))) {
             const char* emojiText = sk_tool_utils::emoji_sample_text();
             paint.measureText(emojiText, strlen(emojiText), &bounds);
             offset += bounds.height();
-            SkAutoTUnref<SkTypeface> randomEmoji(new SkRandomTypeface(orig, paint, false));
-            paint.setTypeface(randomEmoji);
+            paint.setTypeface(sk_make_sp<SkRandomTypeface>(orig, paint, false));
             sk_tool_utils::add_to_text_blob(&builder, emojiText, paint, 0, offset);
         }