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

Unified Diff: src/core/SkPicture.cpp

Issue 88233003: Code cleanup following recapture of skps (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Fixed up Created 7 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
Index: src/core/SkPicture.cpp
===================================================================
--- src/core/SkPicture.cpp (revision 12392)
+++ src/core/SkPicture.cpp (working copy)
@@ -284,16 +284,7 @@
if (!stream->read(&info, sizeof(SkPictInfo))) {
return false;
}
- if (PICTURE_VERSION != info.fVersion
-#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
- // V13 is backwards compatible with V12
- && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .skps regenerated
-#endif
-#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
- // V14 is backwards compatible with V13
- && PRIOR_PICTURE_VERSION2 != info.fVersion // TODO: remove when .skps regenerated
-#endif
- ) {
+ if (PICTURE_VERSION != info.fVersion) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698