simple patch to always init SkTextBlob uniqueID

src/core/SkTextBlob.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTextBlob.h"
 
 #include "SkReadBuffer.h"
@@ skipping 92 matching lines @@
     uint32_t         fCount;
     SkPoint          fOffset;
     SkPaint          fFont;
     GlyphPositioning fPositioning;
 
     SkDEBUGCODE(unsigned fMagic;)
 };
 
 SkTextBlob::SkTextBlob(int runCount, const SkRect& bounds)
     : fRunCount(runCount)
-    , fBounds(bounds) {
+    , fBounds(bounds)
+    , fUniqueID(SK_InvalidGenID) {

[mtklein, 2015/03/24 20:45:08]

let's do

static int32_t gNextID = 1;
static int32_t next_id() {
    int32_t id;
    do { 
        id = sk_atomic_inc(&gNextID);
    } while (id == SK_InvalidGenID);
    return id;
}

....

    , fUniqueID(next_id())  {}

That lets fUniqueID be const.

+    static int32_t  gTextBlobGenerationID; // = 0;
+
+    // loop in case our global wraps around, as we never want SK_InvalidGenID uniqueID
+    while (SK_InvalidGenID == fUniqueID) {
+        fUniqueID = sk_atomic_inc(&gTextBlobGenerationID) + 1;
+    }
 }
 
 SkTextBlob::~SkTextBlob() {
     const RunRecord* run = RunRecord::First(this);
     for (int i = 0; i < fRunCount; ++i) {
         const RunRecord* nextRun = RunRecord::Next(run);
         SkDEBUGCODE(run->validate((uint8_t*)this + fStorageSize);)
         run->~RunRecord();
         run = nextRun;
     }
 }
 
-uint32_t SkTextBlob::uniqueID() const {
-    static int32_t  gTextBlobGenerationID; // = 0;
-
-    // loop in case our global wraps around, as we never want to return SK_InvalidGenID
-    while (SK_InvalidGenID == fUniqueID) {
-        fUniqueID = sk_atomic_inc(&gTextBlobGenerationID) + 1;
-    }
-
-    return fUniqueID;
-}
-
 void SkTextBlob::flatten(SkWriteBuffer& buffer) const {
     int runCount = fRunCount;
 
     buffer.write32(runCount);
     buffer.writeRect(fBounds);
 
     SkPaint runPaint;
     RunIterator it(this);
     while (!it.done()) {
         SkASSERT(it.glyphCount() > 0);
@@ skipping 389 matching lines @@
 
     fStorageUsed = 0;
     fStorageSize = 0;
     fRunCount = 0;
     fLastRun = 0;
     fBounds.setEmpty();
 
     return blob;
 }