Revert of Move SkTypeface to sk_sp.

gm/verttext2.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 /* Tests text vertical text rendering with different fonts and centering.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkTypeface.h"
 
 namespace skiagm {
 
 class VertText2GM : public GM {
 public:
-    VertText2GM() {}
+    VertText2GM()
+        : fProp(nullptr)
+        , fMono(nullptr) {
+    }
+
+    virtual ~VertText2GM() {
+        SkSafeUnref(fProp);
+        SkSafeUnref(fMono);
+    }
 
 protected:
     void onOnceBeforeDraw() override {
         const int pointSize = 24;
         textHeight = SkIntToScalar(pointSize);
-        fProp = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("sans-serif"),
+        fProp = SkTypeface::CreateFromName(sk_tool_utils::platform_font_name("sans-serif"),
                 SkTypeface::kNormal);
-        fMono = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("monospace"),
+        fMono = SkTypeface::CreateFromName(sk_tool_utils::platform_font_name("monospace"),
                 SkTypeface::kNormal);
     }
 
     SkString onShortName() override {
         SkString name("verttext2");
         name.append(sk_tool_utils::major_platform_os_name());
         return name;
     }
 
     SkISize onISize() override { return SkISize::Make(640, 480); }
@@ skipping 20 matching lines @@
                      fMono, SkPaint::kCenter_Align);
             canvas->rotate(SkIntToScalar(-15));
             canvas->translate(textHeight * 4, SkIntToScalar(50));
             if (i > 0) {
                 canvas->translate(0, SkIntToScalar(50));
             }
         }
     }
 
     void drawText(SkCanvas* canvas, const SkString& string,
-                  sk_sp<SkTypeface> family, SkPaint::Align alignment) {
+                  SkTypeface* family, SkPaint::Align alignment) {
         SkPaint paint;
         paint.setColor(SK_ColorBLACK);
         paint.setAntiAlias(true);
         paint.setVerticalText(true);
         paint.setTextAlign(alignment);
-        paint.setTypeface(std::move(family));
+        paint.setTypeface(family);
         paint.setTextSize(textHeight);
 
         canvas->drawText(string.c_str(), string.size(), y,
                 SkIntToScalar(alignment == SkPaint::kLeft_Align ? 10 : 240),
                 paint);
         y += textHeight;
     }
 
 private:
     typedef GM INHERITED;
     SkScalar y, textHeight;
-    sk_sp<SkTypeface> fProp;
-    sk_sp<SkTypeface> fMono;
+    SkTypeface* fProp;
+    SkTypeface* fMono;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new VertText2GM; }
 static GMRegistry reg(MyFactory);
 
 }