Revert of Move SkTypeface to sk_sp.

src/utils/SkLua.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 "SkLua.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 907 matching lines @@
     get_obj<SkPaint>(L, 1)->setTextSize(lua2scalar(L, 2));
     return 0;
 }
 
 static int lpaint_getTypeface(lua_State* L) {
     push_ref(L, get_obj<SkPaint>(L, 1)->getTypeface());
     return 1;
 }
 
 static int lpaint_setTypeface(lua_State* L) {
-    get_obj<SkPaint>(L, 1)->setTypeface(sk_ref_sp(get_ref<SkTypeface>(L, 2)));
+    get_obj<SkPaint>(L, 1)->setTypeface(get_ref<SkTypeface>(L, 2));
     return 0;
 }
 
 static int lpaint_getHinting(lua_State* L) {
     SkLua(L).pushU32(get_obj<SkPaint>(L, 1)->getHinting());
     return 1;
 }
 
 static int lpaint_getFilterQuality(lua_State* L) {
     SkLua(L).pushU32(get_obj<SkPaint>(L, 1)->getFilterQuality());
@@ skipping 1103 matching lines @@
     int style = SkTypeface::kNormal;
 
     int count = lua_gettop(L);
     if (count > 0 && lua_isstring(L, 1)) {
         name = lua_tolstring(L, 1, nullptr);
         if (count > 1 && lua_isnumber(L, 2)) {
             style = lua_tointegerx(L, 2, nullptr) & SkTypeface::kBoldItalic;
         }
     }
 
-    sk_sp<SkTypeface> face(SkTypeface::MakeFromName(name, (SkTypeface::Style)style));
+    SkTypeface* face = SkTypeface::CreateFromName(name,
+                                                  (SkTypeface::Style)style);
 //    SkDebugf("---- name <%s> style=%d, face=%p ref=%d\n", name, style, face, face->getRefCnt());
     if (nullptr == face) {
-        face = SkTypeface::MakeDefault();
+        face = SkTypeface::RefDefault();
     }
-    push_ref(L, std::move(face));
+    push_ref(L, face)->unref();
     return 1;
 }
 
 static int lsk_newRasterSurface(lua_State* L) {
     int width = lua2int_def(L, 1, 0);
     int height = lua2int_def(L, 2, 0);
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
     auto surface = SkSurface::MakeRaster(info, &props);
     if (nullptr == surface) {
@@ skipping 68 matching lines @@
     REG_CLASS(L, SkTextBlob);
     REG_CLASS(L, SkTypeface);
     REG_CLASS(L, SkXfermode);
 }
 
 extern "C" int luaopen_skia(lua_State* L);
 extern "C" int luaopen_skia(lua_State* L) {
     SkLua::Load(L);
     return 0;
 }