Make skpinfo able to inspect SK_PICT_TYPEFACE_TAG blocks

src/core/SkPaint.cpp

Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index d3384a628d05dc421758816d893bbbb7800fe403..2ed3f3aef280336502cba4b9c7f44740627becbe 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2123,15 +2123,19 @@ void SkPaint::toString(SkString* str) const {
         SkDynamicMemoryWStream ostream;
         typeface->serialize(&ostream);
         SkAutoTDelete<SkStreamAsset> istream(ostream.detachAsStream());
-        SkFontDescriptor descriptor(istream);
-
-        str->append("<dt>Font Family Name:</dt><dd>");
-        str->append(descriptor.getFamilyName());
-        str->append("</dd><dt>Font Full Name:</dt><dd>");
-        str->append(descriptor.getFullName());
-        str->append("</dd><dt>Font PS Name:</dt><dd>");
-        str->append(descriptor.getPostscriptName());
-        str->append("</dd>");
+        SkFontDescriptor descriptor;
+

[bungeman-skia, 2016/02/25 15:41:17]

nit: here and in the other files where an SkFontDescriptor is declared, there is
this blank line between the declaration and the 'if' which initializes it. This
seems quite artificial and somewhat misleading, as the declaration should be
visually more strongly attached to the use than the unrelated block above it.

[robertphillips, 2016/02/25 15:53:22]

Done.

+        if (!SkFontDescriptor::Deserialize(istream, &descriptor)) {
+            str->append("<dt>FontDescriptor deserialization failed</dt>");
+        } else {
+            str->append("<dt>Font Family Name:</dt><dd>");
+            str->append(descriptor.getFamilyName());
+            str->append("</dd><dt>Font Full Name:</dt><dd>");
+            str->append(descriptor.getFullName());
+            str->append("</dd><dt>Font PS Name:</dt><dd>");
+            str->append(descriptor.getPostscriptName());
+            str->append("</dd>");
+        }
     }
 
     str->append("<dt>TextSize:</dt><dd>");