Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: src/core/SkPictureData.cpp

Issue 770703002: Bump min picture version. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: TODO Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/core/SkReadBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPictureData.cpp
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index 2dff8eb1d763791325c082b62a2787a221f4ea9a..2b2265403f0e6ed038448cb7d9422d032012f124 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -321,17 +321,7 @@ bool SkPictureData::parseStreamTag(SkStream* stream,
break;
case SK_PICT_FACTORY_TAG: {
SkASSERT(!haveBuffer);
- // Remove this code when v21 and below are no longer supported. At the
- // same time add a new 'count' variable and use it rather then reusing 'size'.
-#ifndef DISABLE_V21_COMPATIBILITY_CODE
- if (fInfo.fVersion >= 22) {
- // in v22 this tag's size represents the size of the chunk in bytes
- // and the number of factory strings is written out separately
-#endif
- size = stream->readU32();
-#ifndef DISABLE_V21_COMPATIBILITY_CODE
- }
-#endif
+ size = stream->readU32();
fFactoryPlayback = SkNEW_ARGS(SkFactoryPlayback, (size));
for (size_t i = 0; i < size; i++) {
SkString str;
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/core/SkReadBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698