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

Unified Diff: src/core/SkImageFilter.cpp

Issue 1010433003: Bump picture version for uniqueID-less SkImageFilter. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 months 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 | « include/core/SkPicture.h ('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/SkImageFilter.cpp
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 0cb954ceff2742442b46edda0f626f1b4486310c..f1553e2ed1c68921e2912d1ab4f30e92423eaf9a 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -100,9 +100,10 @@ bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) {
uint32_t flags = buffer.readUInt();
fCropRect = CropRect(rect, flags);
- // FIXME: this is now unused; and should be made conditional on the next SkPicture version bump.
- // See skbug.com/3559.
- (void) buffer.readUInt();
+ if (buffer.isVersionLT(SkReadBuffer::kImageFilterNoUniqueID_Version)) {
+
+ (void) buffer.readUInt();
+ }
return buffer.isValid();
}
@@ -161,9 +162,6 @@ void SkImageFilter::flatten(SkWriteBuffer& buffer) const {
}
buffer.writeRect(fCropRect.rect());
buffer.writeUInt(fCropRect.flags());
- // FIXME: this is now unused; and should be removed on the next SkPicture version bump.
- // See skbug.com/3559.
- buffer.writeUInt(0);
}
bool SkImageFilter::filterImage(Proxy* proxy, const SkBitmap& src,
« no previous file with comments | « include/core/SkPicture.h ('k') | src/core/SkReadBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698