simplify uniqueID code in picture
patch from issue 750003002 at patchset 1 (http://crrev.com/750003002#ps1)
BUG=skia:
Review URL: https://codereview.chromium.org/752573002
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index dc522a5..e9500b2 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -128,12 +128,9 @@
*/
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
@@ -249,7 +246,6 @@
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;
@@ -264,12 +260,12 @@
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