diff options
| author |  reed <reed@google.com> | 2014-11-21 08:07:41 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-21 08:07:41 -0800 |
| commit | 41d2c2e434d11e73f66c597913c29ea1fb3fa879 (patch) | |
| tree | a57defd795d6813f9245342432ccb81b52c35b6a /include/core | |
| parent | 8f81b69ed763777a922bce27b5f05f4179b76157 (diff) | |
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
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkPicture.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index dc522a5c9d..e9500b25c5 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -128,12 +128,9 @@ public: */ 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 @@ private: 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 @@ private: 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 |