Remove filename from SkFontDescriptor.

src/core/SkFontDescriptor.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontDescriptor.h"
 #include "SkStream.h"
 #include "SkData.h"
@@ skipping 14 matching lines @@
 SkFontDescriptor::SkFontDescriptor(SkTypeface::Style style) : fFontIndex(0), fStyle(style) { }
 
 static void read_string(SkStream* stream, SkString* string) {
     const uint32_t length = SkToU32(stream->readPackedUInt());
     if (length > 0) {
         string->resize(length);
         stream->read(string->writable_str(), length);
     }
 }
 
+static void skip_string(SkStream* stream) {
+    const uint32_t length = SkToU32(stream->readPackedUInt());
+    if (length > 0) {
+        stream->skip(length);
+    }
+}
+
 static void write_string(SkWStream* stream, const SkString& string,
                          uint32_t id) {
     if (!string.isEmpty()) {
         stream->writePackedUInt(id);
         stream->writePackedUInt(string.size());
         stream->write(string.c_str(), string.size());
     }
 }
 
 static size_t read_uint(SkStream* stream) {
@@ skipping 16 matching lines @@
             case kFullName:
                 read_string(stream, &fFullName);
                 break;
             case kPostscriptName:
                 read_string(stream, &fPostscriptName);
                 break;
             case kFontIndex:
                 fFontIndex = read_uint(stream);
                 break;
             case kFontFileName:
-                read_string(stream, &fFontFileName);
+                skip_string(stream);
                 break;

[mtklein, 2015/04/17 17:00:46]

Why do we keep this around?  For serialized pictures?  If so, better bump the
picture version and mark this code up like the rest with things that say "you
can remove this once the minimum picture version passes NN".

[bungeman-skia, 2015/04/17 17:44:51]

Added assert to SkPicture.h and comments here.

             default:
                 SkDEBUGFAIL("Unknown id used by a font descriptor");
                 return;
         }
     }
 
     size_t length = stream->readPackedUInt();
     if (length > 0) {
         SkAutoTUnref<SkData> data(SkData::NewUninitialized(length));
         if (stream->read(data->writable_data(), length) == length) {
             fFontData.reset(SkNEW_ARGS(SkMemoryStream, (data)));
         }
     }
 }
 
 void SkFontDescriptor::serialize(SkWStream* stream) {
     stream->writePackedUInt(fStyle);
 
     write_string(stream, fFamilyName, kFontFamilyName);
     write_string(stream, fFullName, kFullName);
     write_string(stream, fPostscriptName, kPostscriptName);
-    write_string(stream, fFontFileName, kFontFileName);
     if (fFontIndex) {
         write_uint(stream, fFontIndex, kFontIndex);
     }
 
     stream->writePackedUInt(kSentinel);
 
     if (fFontData) {
         size_t length = fFontData->getLength();
         stream->writePackedUInt(length);
         stream->writeStream(fFontData, length);
     } else {
         stream->writePackedUInt(0);
     }
 }