Serialize the font index.

src/core/SkPaint.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPaint.h"
 #include "SkAnnotation.h"
 #include "SkAutoKern.h"
@@ skipping 2290 matching lines @@
 
     if (this->getImageFilter()) {
         this->getImageFilter()->computeFastBounds(*storage, storage);
     }
 
     return *storage;
 }
 
 #ifndef SK_IGNORE_TO_STRING
 
-static SkFontDescriptor typeface_getDescriptor(const SkTypeface* face) {
-    SkDynamicMemoryWStream ostream;
-    face->serialize(&ostream);
-    SkAutoTUnref<SkStreamAsset> istream(ostream.detachAsStream());
-    return SkFontDescriptor(istream);

[bungeman-skia, 2014/09/18 14:50:09]

This required a copy constructor, and that seems awkward. Since this is the only
place this was needed, I just re-inlined it. Making this code an actual
SkFontDescriptor constructor would fix this. (Would you like me to add that
here?)

-}
-
 void SkPaint::toString(SkString* str) const {
     str->append("<dl><dt>SkPaint:</dt><dd><dl>");
 
     SkTypeface* typeface = this->getTypeface();
     if (typeface) {
-        SkFontDescriptor descriptor(typeface_getDescriptor(typeface));
+        SkDynamicMemoryWStream ostream;
+        typeface->serialize(&ostream);
+        SkAutoTUnref<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><dt>Font File Name:</dt><dd>");
         str->append(descriptor.getFontFileName());
         str->append("</dd>");
@@ skipping 340 matching lines @@
     F_UNREF(Looper,      readDrawLooper);
     F_UNREF(ImageFilter, readImageFilter);
     F(Typeface,    readTypeface);
 #undef F
 #undef F_UNREF
     if (dirty & kAnnotation_DirtyBit) {
         paint->setAnnotation(SkAnnotation::Create(buffer))->unref();
     }
     SkASSERT(dirty == paint->fDirtyBits);
 }