Convert SkPicture's generation ID to a unique ID

src/core/SkPicture.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 122 matching lines @@
     fHeight = src.fHeight;
     fRecord = NULL;
 
     /*  We want to copy the src's playback. However, if that hasn't been built
         yet, we need to fake a call to endRecording() without actually calling
         it (since it is destructive, and we don't want to change src).
      */
     if (src.fPlayback) {
         fPlayback = SkNEW_ARGS(SkPicturePlayback, (*src.fPlayback));
         SkASSERT(NULL == src.fRecord);
-        fGenerationID = src.getGenerationID();     // need to call method to ensure != 0
+        fUniqueID = src.uniqueID();     // need to call method to ensure != 0
     } else if (src.fRecord) {
         SkPictInfo info;
         this->createHeader(&info);
         // here we do a fake src.endRecording()
         fPlayback = SkNEW_ARGS(SkPicturePlayback, (*src.fRecord, info));
     } else {
         fPlayback = NULL;
     }
 }
 
 SkPicture::~SkPicture() {
     SkSafeUnref(fRecord);
     SkDELETE(fPlayback);
     SkSafeUnref(fAccelData);
 }
 
 void SkPicture::internalOnly_EnableOpts(bool enableOpts) {
     if (NULL != fRecord) {
         fRecord->internalOnly_EnableOpts(enableOpts);
     }
 }
 
 void SkPicture::swap(SkPicture& other) {
-    SkTSwap(fGenerationID, other.fGenerationID);
+    SkTSwap(fUniqueID, other.fUniqueID);
     SkTSwap(fRecord, other.fRecord);
     SkTSwap(fPlayback, other.fPlayback);
     SkTSwap(fAccelData, other.fAccelData);
     SkTSwap(fWidth, other.fWidth);
     SkTSwap(fHeight, other.fHeight);
 }
 
 SkPicture* SkPicture::clone() const {
     SkPicture* clonedPicture = SkNEW(SkPicture);
     this->clone(clonedPicture, 1);
@@ skipping 14 matching lines @@
         SkSafeSetNull(clone->fRecord);
         SkDELETE(clone->fPlayback);
 
         /*  We want to copy the src's playback. However, if that hasn't been built
             yet, we need to fake a call to endRecording() without actually calling
             it (since it is destructive, and we don't want to change src).
          */
         if (fPlayback) {
             clone->fPlayback = SkNEW_ARGS(SkPicturePlayback, (*fPlayback, &copyInfo));
             SkASSERT(NULL == fRecord);
-            clone->fGenerationID = this->getGenerationID(); // need to call method to ensure != 0
+            clone->fUniqueID = this->uniqueID(); // need to call method to ensure != 0
         } else if (fRecord) {
             // here we do a fake src.endRecording()
             clone->fPlayback = SkNEW_ARGS(SkPicturePlayback, (*fRecord, info, true));
         } else {
             clone->fPlayback = NULL;
         }
     }
 }
 
 SkPicture::AccelData::Domain SkPicture::AccelData::GenerateDomain() {
@@ skipping 286 matching lines @@
 }
 #endif
 
 static int32_t next_picture_generation_id() {
     static int32_t  gPictureGenerationID = 0;
     // do a loop in case our global wraps around, as we never want to
     // return a 0
     int32_t genID;
     do {
         genID = sk_atomic_inc(&gPictureGenerationID) + 1;
-    } while (((int32_t)SkPicture::kInvalidGenID) == genID);
+    } while (SK_InvalidGenID == genID);
     return genID;
 }
 
-uint32_t SkPicture::getGenerationID() const {
+uint32_t SkPicture::uniqueID() const {
     if (NULL != fRecord) {
         SkASSERT(NULL == fPlayback);
-        return kInvalidGenID;
+        return SK_InvalidGenID;
     }
 
-    if (kInvalidGenID == fGenerationID) {
-        fGenerationID = next_picture_generation_id();
+    if (SK_InvalidGenID == fUniqueID) {
+        fUniqueID = next_picture_generation_id();
     }
-    return fGenerationID;
+    return fUniqueID;
 }