commit c5166a9dcbf2eeb95cb8e2918271132aa34bf5cd
author Mike Reed <reed@google.com> Wed Jan 03 13:17:18 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 03 20:03:59 2018 +0000
tree 552bcec5b3d9d6a6889ed1787c5811e72c706212
parent 3c36ef6be93400368fee3ea2e0dca6cff4972bb0

Revert "Revert "remove legacy support for old old picture versions""

This reverts commit 6f1151140f331c78d99ede3cac10462dc8b32cde.

Chrome has been updated, so this should be able to land.

Bug: skia:
Change-Id: I5a66782a39fecfac00edeb66fbd03dae4df1712c
Reviewed-on: https://skia-review.googlesource.com/90205
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkTextBlob.cpp

diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index 91ec79b..6d89e6f 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -790,20 +790,13 @@
 }
 
 sk_sp<SkTextBlob> SkTextBlob::MakeFromBuffer(SkReadBuffer& reader) {
-    const int runCount = reader.isVersionLT(SkReadBuffer::kTextBlobImplicitRunCount_Version)
-    ? reader.read32() : std::numeric_limits<int>::max();
-    if (runCount < 0) {
-        return nullptr;
-    }
-
     SkRect bounds;
     reader.readRect(&bounds);
 
     SkTextBlobBuilder blobBuilder;
-    for (int i = 0; i < runCount; ++i) {
+    for (;;) {
         int glyphCount = reader.read32();
-        if (glyphCount == 0 &&
-            !reader.isVersionLT(SkReadBuffer::kTextBlobImplicitRunCount_Version)) {
+        if (glyphCount == 0) {
             // End-of-runs marker.
             break;
         }