Make skpinfo able to inspect SK_PICT_TYPEFACE_TAG blocks

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"
@@ skipping 166 matching lines @@
         }
         SkDebugf("checksum updated\n");
         SkDebugf("    { \"%s\", 0x%08x },\n", fontName, checksum);
 #endif
         whitelist[whitelistIndex].fChecksum = checksum;
     }
     serialize_sub(fontName, tf->style(), wstream);
 }
 
 SkTypeface* WhitelistDeserializeTypeface(SkStream* stream) {
-    SkFontDescriptor desc(stream);
+    SkFontDescriptor desc;
+    if (!SkFontDescriptor::Deserialize(stream, &desc)) {
+        return nullptr;
+    }
+
     SkFontData* data = desc.detachFontData();
     if (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;
@@ skipping 61 matching lines @@
         const char* fontName = whitelist[i].fFontName;
         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;
 }