simplify uniqueID code in picture

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 110 matching lines @@
     int width() const  { return fCullRect.roundOut().width(); }
     int height() const { return fCullRect.roundOut().height(); }
 #endif
 
     /** Return the cull rect used when creating this picture: { 0, 0, cullWidth, cullHeight }.
         It does not necessarily reflect the bounds of what has been recorded into the picture.
         @return the cull rect used to create this picture
     */
     SkRect cullRect() const { return fCullRect; }
 
-    /** Return a non-zero, unique value representing the picture. This call is
-        only valid when not recording. Between a beginRecording/endRecording
-        pair it will just return 0 (the invalid ID). Each beginRecording/
-        endRecording pair will cause a different generation ID to be returned.
-    */
-    uint32_t uniqueID() const;
+    /** Return a non-zero, unique value representing the picture.
+     */
+    uint32_t uniqueID() const { return fUniqueID; }
 
     /**
      *  Function to encode an SkBitmap to an SkData. A function with this
      *  signature can be passed to serialize() and SkWriteBuffer.
      *  Returning NULL will tell the SkWriteBuffer to use
      *  SkBitmap::flatten() to store the bitmap.
      *
      *  @param pixelRefOffset DEPRECATED -- caller assumes it will return 0.
      *  @return SkData If non-NULL, holds encoded data representing the passed
      *      in bitmap. The caller is responsible for calling unref().
@@ skipping 95 matching lines @@
     // V36: Remove (obsolete) alphatype from SkColorTable
     // V37: Added shadow only option to SkDropShadowImageFilter
 
     // 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 = 19;
     static const uint32_t CURRENT_PICTURE_VERSION = 37;
 
-    void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
     void callDeletionListeners();
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     // Takes ownership of the SkRecord, refs the (optional) drawablePicts and BBH.
     SkPicture(const SkRect& cullRect, SkRecord*, SkData* drawablePicts,
               SkBBoxHierarchy*);
 
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
     static SkPictureData* Backport(const SkRecord&, const SkPictInfo&,
                                    SkPicture const* const drawablePics[], int drawableCount);
 
     // uint32_t fRefCnt; from SkNVRefCnt<SkPicture>
-    mutable uint32_t fUniqueID;
+    const uint32_t                        fUniqueID;
     const SkRect                          fCullRect;
     mutable SkAutoTUnref<const AccelData> fAccelData;
     mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
-    SkAutoTDelete<SkRecord>       fRecord;
-    SkAutoTUnref<SkBBoxHierarchy> fBBH;
+    SkAutoTDelete<const SkRecord>       fRecord;
+    SkAutoTUnref<const SkBBoxHierarchy> fBBH;
     SkAutoTUnref<SkData>          fDrawablePicts;
 
     // helpers for fDrawablePicts
     int drawableCount() const;
     // will return NULL if drawableCount() returns 0
     SkPicture const* const* drawablePicts() const;
 
     struct PathCounter;
 
     struct Analysis {
@@ skipping 12 matching lines @@
     } fAnalysis;
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif