Revert of Move SkTypeface to sk_sp.

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDescriptor.h"
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
@@ skipping 133 matching lines @@
         metrics->fXMin = SkScalarMul(metrics->fXMin, scale);
         metrics->fXMax = SkScalarMul(metrics->fXMax, scale);
         metrics->fXHeight = SkScalarMul(metrics->fXHeight, scale);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTypefaceCache.h"
 
-SkGTypeface::SkGTypeface(sk_sp<SkTypeface> proxy, const SkPaint& paint)
+SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint)
     : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
-    , fProxy(std::move(proxy))
-    , fPaint(paint)
-{}
+    , fProxy(SkRef(proxy))
+    , fPaint(paint) {}
+
+SkGTypeface::~SkGTypeface() {
+    fProxy->unref();
+}
 
 SkScalerContext* SkGTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
                                                     const SkDescriptor* desc) const {
     return new SkGScalerContext(const_cast<SkGTypeface*>(this), effects, desc);
 }
 
 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
     fProxy->filterRec(rec);
     rec->setHinting(SkPaint::kNo_Hinting);
     rec->fMaskFormat = SkMask::kARGB32_Format;
@@ skipping 79 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif