Move SkTypeface to sk_sp.

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

1 files changed, 3 insertions, 8 deletions

diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp
index bc5feb3375..c7d4309f97 100644
--- a/gm/gammatext.cpp
+++ b/gm/gammatext.cpp
@@ -19,12 +19,8 @@ static sk_sp<SkShader> make_heatGradient(const SkPoint pts[2]) {
 }
 
 static bool setFont(SkPaint* paint, const char name[]) {
-    SkTypeface* tf = SkTypeface::CreateFromName(name, SkTypeface::kNormal);
-    if (tf) {
-        paint->setTypeface(tf)->unref();
-        return true;
-    }
-    return false;
+    paint->setTypeface(SkTypeface::MakeFromName(name, SkTypeface::kNormal));
+    return SkToBool(paint->getTypeface());
 }
 
 /**
@@ -108,8 +104,7 @@ static sk_sp<SkShader> make_gradient(SkColor c) {
 }
 
 static void set_face(SkPaint* paint) {
-    SkTypeface* face = SkTypeface::CreateFromName("serif", SkTypeface::kItalic);
-    SkSafeUnref(paint->setTypeface(face));
+    paint->setTypeface(SkTypeface::MakeFromName("serif", SkTypeface::kItalic));
 }
 
 static void draw_pair(SkCanvas* canvas, SkPaint* paint, const sk_sp<SkShader>& shader) {