diff options
author | 2017-02-09 16:16:08 -0500 | |
---|---|---|
committer | 2017-02-09 22:36:57 +0000 | |
commit | e037d12625b1dbb7952ae8a6553d6830e8b3ebbf (patch) | |
tree | 45d703b50d0de790a1cded7a7175689dbabcc72b /src/core/SkFontDescriptor.cpp | |
parent | d9569664fe76068adcc87d7a029350f5dbdbc4a6 (diff) |
Roll minimum picture version up to 44.
This is the version produced by Chrome M54. M56 is stable now.
I am most interested in deleting SkBitmapSourceDeserializer,
because it awkwardly calls from core into effects (SkImageSource).
Change-Id: I58b8b990017ba43372ab3333a4ef8312e75abc61
Reviewed-on: https://skia-review.googlesource.com/8286
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/core/SkFontDescriptor.cpp')
-rw-r--r-- | src/core/SkFontDescriptor.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/core/SkFontDescriptor.cpp b/src/core/SkFontDescriptor.cpp index 73ea2058ce..94fe23d446 100644 --- a/src/core/SkFontDescriptor.cpp +++ b/src/core/SkFontDescriptor.cpp @@ -20,7 +20,6 @@ enum { // defines for names in its 'name' table. kFontAxes = 0xFC, kFontIndex = 0xFD, - kFontFileName = 0xFE, // Remove when MIN_PICTURE_VERSION > 41 kSentinel = 0xFF, }; @@ -34,14 +33,6 @@ static void read_string(SkStream* stream, SkString* string) { } } -// Remove when MIN_PICTURE_VERSION > 41 -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); @@ -94,9 +85,6 @@ bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) { case kFontIndex: index = read_uint(stream); break; - case kFontFileName: // Remove when MIN_PICTURE_VERSION > 41 - skip_string(stream); - break; default: SkDEBUGFAIL("Unknown id used by a font descriptor"); return false; |