Revert of Move SkTypeface to sk_sp.

bench/SkGlyphCacheBench.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 "SkGlyphCache.h"
 
@@ skipping 35 matching lines @@
         return fName.c_str();
     }
 
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
     void onDraw(int loops, SkCanvas*) override {
         size_t oldCacheLimitSize = SkGraphics::GetFontCacheLimit();
         SkGraphics::SetFontCacheLimit(fCacheSize);
+        SkTypeface* typeface = sk_tool_utils::create_portable_typeface(
+            "serif", SkTypeface::kItalic);
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
-        paint.setTypeface(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kItalic));
+        paint.setTypeface(typeface);
 
         for (int work = 0; work < loops; work++) {
             do_font_stuff(&paint);
         }
         SkGraphics::SetFontCacheLimit(oldCacheLimitSize);
+        SkSafeUnref(typeface);
     }
 
 private:
     typedef Benchmark INHERITED;
     const size_t fCacheSize;
     SkString fName;
 };
 
 class SkGlyphCacheStressTest : public Benchmark {
 public:
     explicit SkGlyphCacheStressTest(int cacheSize) : fCacheSize(cacheSize) { }
 
 protected:
     const char* onGetName() override {
         fName.printf("SkGlyphCacheStressTest%dK", (int)(fCacheSize >> 10));
         return fName.c_str();
     }
 
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
     void onDraw(int loops, SkCanvas*) override {
         size_t oldCacheLimitSize = SkGraphics::GetFontCacheLimit();
         SkGraphics::SetFontCacheLimit(fCacheSize);
-        sk_sp<SkTypeface> typefaces[] =
+        SkTypeface* typefaces[] =
             {sk_tool_utils::create_portable_typeface("serif", SkTypeface::kItalic),
              sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kItalic)};
 
         for (int work = 0; work < loops; work++) {
             SkTaskGroup().batch(16, [&](int threadIndex) {
                 SkPaint paint;
                 paint.setAntiAlias(true);
                 paint.setSubpixelText(true);
                 paint.setTypeface(typefaces[threadIndex % 2]);
                 do_font_stuff(&paint);
             });
         }
         SkGraphics::SetFontCacheLimit(oldCacheLimitSize);
+        SkSafeUnref(typefaces[0]);
+        SkSafeUnref(typefaces[1]);
     }
 
 private:
     typedef Benchmark INHERITED;
     const size_t fCacheSize;
     SkString fName;
 };
 
 DEF_BENCH( return new SkGlyphCacheBasic(256 * 1024); )
 DEF_BENCH( return new SkGlyphCacheBasic(32 * 1024 * 1024); )
 DEF_BENCH( return new SkGlyphCacheStressTest(256 * 1024); )
 DEF_BENCH( return new SkGlyphCacheStressTest(32 * 1024 * 1024); )