Revert of Move SkTypeface to sk_sp.

src/utils/SkWhitelistTypefaces.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 "SkChecksum.h"
 #include "SkFontDescriptor.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
 #include "../sfnt/SkOTUtils.h"
 
 #include "SkWhitelistChecksums.cpp"
 
 #define WHITELIST_DEBUG 0
 
 extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
-sk_sp<SkTypeface> WhitelistDeserializeTypeface(SkStream* );
+extern SkTypeface* WhitelistDeserializeTypeface(SkStream* );
 extern bool CheckChecksums();
 extern bool GenerateChecksums();
 
 #if WHITELIST_DEBUG
 static bool timesNewRomanSerializedNameOnly = false;
 #endif
 
 #define SUBNAME_PREFIX "sk_"
 
 static bool font_name_is_local(const char* fontName, SkTypeface::Style style) {
     if (!strcmp(fontName, "DejaVu Sans")) {
         return true;
     }
-    sk_sp<SkTypeface> defaultFace(SkTypeface::MakeFromName(nullptr, style));
-    sk_sp<SkTypeface> foundFace(SkTypeface::MakeFromName(fontName, style));
+    SkTypeface* defaultFace = SkTypeface::CreateFromName(nullptr, style);
+    SkTypeface* foundFace = SkTypeface::CreateFromName(fontName, style);
     return defaultFace != foundFace;
 }
 
 static int whitelist_name_index(const SkTypeface* tf) {
 
     SkString fontNameStr;
     SkAutoTUnref<SkTypeface::LocalizedStrings> nameIter(
         SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*tf));
     SkTypeface::LocalizedString familyNameLocalized;
     while (nameIter->next(&familyNameLocalized)) {
@@ skipping 129 matching lines @@
             SkDebugf("!!! checksum changed !!!\n");
         }
         SkDebugf("checksum updated\n");
         SkDebugf("    { \"%s\", 0x%08x },\n", fontName, checksum);
 #endif
         whitelist[whitelistIndex].fChecksum = checksum;
     }
     serialize_sub(fontName, tf->style(), wstream);
 }
 
-sk_sp<SkTypeface> WhitelistDeserializeTypeface(SkStream* stream) {
+SkTypeface* WhitelistDeserializeTypeface(SkStream* stream) {
     SkFontDescriptor desc;
     if (!SkFontDescriptor::Deserialize(stream, &desc)) {
         return nullptr;
     }
 
     SkFontData* data = desc.detachFontData();
     if (data) {
-        sk_sp<SkTypeface> typeface(SkTypeface::MakeFromFontData(data));
+        SkTypeface* typeface = SkTypeface::CreateFromFontData(data);
         if (typeface) {
             return typeface;
         }
     }
     const char* familyName = desc.getFamilyName();
     if (!strncmp(SUBNAME_PREFIX, familyName, sizeof(SUBNAME_PREFIX) - 1)) {
         familyName += sizeof(SUBNAME_PREFIX) - 1;
     }
-    return SkTypeface::MakeFromName(familyName, desc.getStyle());
+    return SkTypeface::CreateFromName(familyName, desc.getStyle());
 }
 
 bool CheckChecksums() {
     for (int i = 0; i < whitelistCount; ++i) {
         const char* fontName = whitelist[i].fFontName;
-        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkTypeface::kNormal));
-        uint32_t checksum = compute_checksum(tf.get());
+        SkTypeface* tf = SkTypeface::CreateFromName(fontName, SkTypeface::kNormal);
+        uint32_t checksum = compute_checksum(tf);
         if (whitelist[i].fChecksum != checksum) {
             return false;
         }
     }
     return true;
 }
 
 const char checksumFileName[] = "SkWhitelistChecksums.cpp";
 
 const char checksumHeader[] =
@@ skipping 33 matching lines @@
     FILE* file = sk_fopen(checksumFileName, kWrite_SkFILE_Flag);
     if (!file) {
         SkDebugf("Can't open %s for writing.\n", checksumFileName);
         return false;
     }
     SkString line;
     line.printf(checksumHeader, __FUNCTION__, __FILE__, checksumFileName);
     sk_fwrite(line.c_str(), line.size(), file);
     for (int i = 0; i < whitelistCount; ++i) {
         const char* fontName = whitelist[i].fFontName;
-        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkTypeface::kNormal));
-        uint32_t checksum = compute_checksum(tf.get());
+        SkTypeface* tf = SkTypeface::CreateFromName(fontName, SkTypeface::kNormal);
+        uint32_t checksum = compute_checksum(tf);
         line.printf(checksumEntry, fontName, checksum);
         sk_fwrite(line.c_str(), line.size(), file);
     }
     sk_fwrite(checksumTrailer, sizeof(checksumTrailer) - 1, file);
     sk_fclose(file);
     return true;
 }