Revert of Move SkTypeface to sk_sp.

tests/PaintTest.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.
  */
 
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
@@ skipping 62 matching lines @@
         size_t (*fSeedTextProc)(const SkUnichar[], void* dst, int count);
         SkPaint::TextEncoding   fEncoding;
     } gRec[] = {
         { uni_to_utf8,  SkPaint::kUTF8_TextEncoding },
         { uni_to_utf16, SkPaint::kUTF16_TextEncoding },
         { uni_to_utf32, SkPaint::kUTF32_TextEncoding },
     };
 
     SkRandom rand;
     SkPaint paint;
-    paint.setTypeface(SkTypeface::MakeDefault());
+    paint.setTypeface(SkTypeface::RefDefault())->unref();
     SkTypeface* face = paint.getTypeface();
 
     for (int i = 0; i < 1000; ++i) {
         // generate some random text
         for (int j = 0; j < NGLYPHS; ++j) {
             src[j] = ' ' + j;
         }
         // inject some random chars, to sometimes abort early
         src[rand.nextU() & 63] = rand.nextU() & 0xFFF;
 
@@ skipping 232 matching lines @@
     SkPaint paint;
     const uint32_t defaultHash = paint.getHash();
 
     // Check that some arbitrary field affects the hash.
     paint.setColor(0xFF00FF00);
     REPORTER_ASSERT(r, paint.getHash() != defaultHash);
     paint.setColor(SK_ColorBLACK);  // Reset to default value.
     REPORTER_ASSERT(r, paint.getHash() == defaultHash);
 
     // SkTypeface is the first field we hash, so test it specially.
-    paint.setTypeface(SkTypeface::MakeDefault());
+    paint.setTypeface(SkTypeface::RefDefault())->unref();
     REPORTER_ASSERT(r, paint.getHash() != defaultHash);
     paint.setTypeface(nullptr);
     REPORTER_ASSERT(r, paint.getHash() == defaultHash);
 
     // This is part of fBitfields, the last field we hash.
     paint.setHinting(SkPaint::kSlight_Hinting);
     REPORTER_ASSERT(r, paint.getHash() != defaultHash);
     paint.setHinting(SkPaint::kNormal_Hinting);
     REPORTER_ASSERT(r, paint.getHash() == defaultHash);
 }
@@ skipping 16 matching lines @@
 
     SkColorMatrix cm;
     cm.setIdentity();   // does not change alpha
     paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
     REPORTER_ASSERT(r, paint.nothingToDraw());
 
     cm.postTranslate(0, 0, 0, 1);    // wacks alpha
     paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
     REPORTER_ASSERT(r, !paint.nothingToDraw());
 }