formalize named picture versions

include/core/SkReadBuffer.h

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkReadBuffer_DEFINED
 #define SkReadBuffer_DEFINED
 
@@ skipping 21 matching lines @@
 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_MAC)
     #define DEBUG_NON_DETERMINISTIC_ASSERT
 #endif
 
 class SkReadBuffer {
 public:
     SkReadBuffer();
     SkReadBuffer(const void* data, size_t size);
     SkReadBuffer(SkStream* stream);
     virtual ~SkReadBuffer();
 

[robertphillips, 2014/05/20 12:34:06]

Remove these two lines?

[reed1, 2014/05/20 17:21:57]

Done.

     /** Return the version of the serialized picture this buffer holds, or 0 if unset. */
-    int pictureVersion() const { return fPictureVersion; }
+ //   int pictureVersion() const { return fPictureVersion; }
+

[robertphillips, 2014/05/20 12:34:06]

intended ?
users ?

[reed1, 2014/05/20 17:21:57]

Done.

+    // Just indended for internal uses who query pictureVersionLT()
+    enum PictureVersion {
+        kFilterLevelIsEnum_PictureVersion         = 23,
+        kGradientFlippedFlag_PictureVersion       = 24,
+        kDashWritesPhaseIntervals_PictureVersion  = 25,
+        kColorShaderNoBool_PictureVersion         = 26,
+    };
+
+    /**

[robertphillips, 2014/05/20 12:34:06]

Returns ?

[reed1, 2014/05/20 17:21:57]

Done.

+     *  Retruns true IFF the picture version is older than the specified version.
+     */
+    bool pictureVersionLT(PictureVersion targetVersion) const {
+        SkASSERT(targetVersion > 0);
+        return fPictureVersion > 0 && fPictureVersion < targetVersion;
+    }
 
     /** This may be called at most once; most clients of SkReadBuffer should not mess with it. */
     void setPictureVersion(int version) {
         SkASSERT(0 == fPictureVersion || version == fPictureVersion);
         fPictureVersion = version;
     }
 
     enum Flags {
         kCrossProcess_Flag  = 1 << 0,
         kScalarIsFloat_Flag = 1 << 1,
@@ skipping 147 matching lines @@
     SkPicture::InstallPixelRefProc fBitmapDecoder;
 
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     // Debugging counter to keep track of how many bitmaps we
     // have decoded.
     int fDecodedBitmapIndex;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 };
 
 #endif // SkReadBuffer_DEFINED