commit 4a22a433bfb972dcd96f76e3d3b0613c26d8fc86
author senorblanco <senorblanco@chromium.org> Wed Mar 18 13:14:54 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Mar 18 13:14:54 2015 -0700
tree 6baa43fb84def25632b96bfc011066631183dae2
parent d803f2731f778317b46da64bce6e7a8a221ffccd

Bump picture version for uniqueID-less SkImageFilter.

Remove writing of the uniqueID, and put reading behind a version check.

BUG=skia:3559

Review URL: https://codereview.chromium.org/1010433003

include/core/SkPicture.h

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 346d65b..a62bedb 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -243,13 +243,14 @@
     // V37: Added shadow only option to SkDropShadowImageFilter (last version to record CLEAR)
     // V38: Added PictureResolution option to SkPictureImageFilter
     // V39: Added FilterLevel option to SkPictureImageFilter
+    // V40: Remove UniqueID serialization from SkImageFilter.
 
     // Note: If the picture version needs to be increased then please follow the
     // steps to generate new SKPs in (only accessible to Googlers): http://goo.gl/qATVcw
 
     // Only SKPs within the min/current picture version range (inclusive) can be read.
     static const uint32_t MIN_PICTURE_VERSION = 35;     // Produced by Chrome M39.
-    static const uint32_t CURRENT_PICTURE_VERSION = 39;
+    static const uint32_t CURRENT_PICTURE_VERSION = 40;
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);

src/core/SkImageFilter.cpp

diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 0cb954c..f1553e2 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -100,9 +100,10 @@
 
     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 @@
     }
     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,

src/core/SkReadBuffer.h

diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index a24ca55..65255e6 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -55,6 +55,7 @@
         kDropShadowMode_Version            = 37,
         kPictureImageFilterResolution_Version = 38,
         kPictureImageFilterLevel_Version   = 39,
+        kImageFilterNoUniqueID_Version     = 40,
     };
 
     /**