Move SkTypeface to sk_sp.

gm/textblobrandomfont.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
@@ skipping 21 matching lines @@
         SkTextBlobBuilder builder;
 
         const char* text = "The quick brown fox jumps over the lazy dog.";
 
         // make textbloben
         SkPaint paint;
         paint.setTextSize(32);
         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;
         paint.measureText(text, strlen(text), &bounds);
         sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, 0);
 
         // A8
         const char* bigtext1 = "The quick brown fox";
         const char* bigtext2 = "jumps over the lazy dog.";
         paint.setTextSize(160);
         paint.setSubpixelText(false);
         paint.setLCDRenderText(false);
         paint.measureText(bigtext1, strlen(bigtext1), &bounds);
         SkScalar offset = bounds.height();
         sk_tool_utils::add_to_text_blob(&builder, bigtext1, paint, 0, offset);
 
         paint.measureText(bigtext2, strlen(bigtext2), &bounds);
         offset += bounds.height();
         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);
         }
 
         // build
         fBlob.reset(builder.build());
     }
 
     SkString onShortName() override {
         return SkString("textblobrandomfont");
     }
@@ skipping 59 matching lines @@
     static const int kHeight = 1600;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TextBlobRandomFont;)
 }
 #endif