simplify uniqueID code in picture

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 27 matching lines @@
 
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 
 template <typename T> int SafeCount(const T* obj) {
     return obj ? obj->count() : 0;
 }
 
+static int32_t gPictureGenerationID;

[mtklein, 2014/11/21 15:51:56]

If find the loop below less clear without "= SK_InvalidGenID" here.

Or, we can just screw the loop.  We're not mutating pictures, and we're not
making 2 billion pictures either.

[reed1, 2014/11/21 15:56:57]

Done.

+static int32_t next_picture_generation_id() {
+    // Loop in case our global wraps around.
+    int32_t genID;
+    do {
+        genID = sk_atomic_inc(&gPictureGenerationID) + 1;
+    } while (SK_InvalidGenID == genID);
+    return genID;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // Some commands have a paint, some have an optional paint.  Either way, get back a pointer.
 static const SkPaint* AsPtr(const SkPaint& p) { return &p; }
 static const SkPaint* AsPtr(const SkRecords::Optional<SkPaint>& p) { return p; }
 
 /** SkRecords visitor to determine whether an instance may require an
     "external" bitmap to rasterize. May return false positives.
@@ skipping 447 matching lines @@
 #if SK_SUPPORT_GPU
 bool SkPicture::suitableForGpuRasterization(GrContext*, const char **reason) const {
     return fAnalysis.suitableForGpuRasterization(reason, 0);
 }
 #endif
 
 bool SkPicture::hasText()             const { return fAnalysis.fHasText; }
 bool SkPicture::willPlayBackBitmaps() const { return fAnalysis.fWillPlaybackBitmaps; }
 int  SkPicture::approximateOpCount()  const { return fRecord->count(); }
 
-static int32_t gPictureGenerationID = SK_InvalidGenID;  // This will be set at link time.
-
-static int32_t next_picture_generation_id() {
-    // Loop in case our global wraps around.
-    int32_t genID;
-    do {
-        genID = sk_atomic_inc(&gPictureGenerationID) + 1;
-    } while (SK_InvalidGenID == genID);
-    return genID;
-}
-
-uint32_t SkPicture::uniqueID() const {
-    if (SK_InvalidGenID == fUniqueID) {
-        fUniqueID = next_picture_generation_id();
-    }
-    return fUniqueID;
-}
-
 SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SkData* drawablePicts,
                      SkBBoxHierarchy* bbh)
-    : fCullRect(cullRect)
+    : fUniqueID(next_picture_generation_id())
+    , fCullRect(cullRect)
     , fRecord(record)
     , fBBH(SkSafeRef(bbh))
     , fDrawablePicts(SkSafeRef(drawablePicts))
-    , fAnalysis(*fRecord) {
-    this->needsNewGenID();
-}
+    , fAnalysis(*fRecord)
+{}
 
 // Note that we are assuming that this entry point will only be called from
 // one thread. Currently the only client of this method is
 // SkGpuDevice::EXPERIMENTAL_optimize which should be only called from a single
 // thread.
 void SkPicture::addDeletionListener(DeletionListener* listener) const {
     SkASSERT(listener);
 
     *fDeletionListeners.append() = SkRef(listener);
 }
 
 void SkPicture::callDeletionListeners() {
     for (int i = 0; i < fDeletionListeners.count(); ++i) {
         fDeletionListeners[i]->onDeletion(this->uniqueID());
     }
 
     fDeletionListeners.unrefAll();
 }