Make SkColorTable explicitly thread-safe.

src/core/SkColorTable.cpp

 
 /*
  * Copyright 2009 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 "SkColorTable.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 
 void SkColorTable::init(const SkPMColor colors[], int count) {
     SkASSERT((unsigned)count <= 256);
 
-    f16BitCache = NULL;
     fCount = count;
     fColors = reinterpret_cast<SkPMColor*>(sk_malloc_throw(count * sizeof(SkPMColor)));
 
     memcpy(fColors, colors, count * sizeof(SkPMColor));
 }
 
-// As copy constructor is hidden in the class hierarchy, we need to call
-// default constructor explicitly to suppress a compiler warning.
-SkColorTable::SkColorTable(const SkColorTable& src) : INHERITED() {
-    this->init(src.fColors, src.fCount);
-}
-
 SkColorTable::SkColorTable(const SkPMColor colors[], int count) {
     SkASSERT(0 == count || colors);
     if (count < 0) {
         count = 0;
     } else if (count > 256) {
         count = 256;
     }
     this->init(colors, count);
 }
 
 SkColorTable::~SkColorTable() {
     sk_free(fColors);
-    sk_free(f16BitCache);
+    // f16BitCache frees itself
 }
 
 #include "SkColorPriv.h"
 
-static inline void build_16bitcache(uint16_t dst[], const SkPMColor src[],
-                                    int count) {
-    while (--count >= 0) {
-        *dst++ = SkPixel32ToPixel16_ToU16(*src++);
+namespace {
+struct Build16BitCache {
+    const SkPMColor* fColors;
+    int fCount;
+
+    uint16_t* operator()() const {
+        uint16_t* cache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
+        for (int i = 0; i < fCount; i++) {
+            cache[i] = SkPixel32ToPixel16_ToU16(fColors[i]);
+        }
+        return cache;
     }
-}
+};
+}//namespace
 
-const uint16_t* SkColorTable::read16BitCache() {
-    if (NULL == f16BitCache) {
-        f16BitCache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
-        build_16bitcache(f16BitCache, fColors, fCount);
-    }
-    return f16BitCache;
+const uint16_t* SkColorTable::read16BitCache() const {
+    const Build16BitCache create = { fColors, fCount };
+    return f16BitCache.get(create);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkColorTable::SkColorTable(SkReadBuffer& buffer) {
-    f16BitCache = NULL;
     if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
         /*fAlphaType = */buffer.readUInt();
     }
 
     fCount = buffer.getArrayCount();
     size_t allocSize = fCount * sizeof(SkPMColor);
     SkDEBUGCODE(bool success = false;)
     if (buffer.validateAvailable(allocSize)) {
         fColors = (SkPMColor*)sk_malloc_throw(allocSize);
         SkDEBUGCODE(success =) buffer.readColorArray(fColors, fCount);
     } else {
         fCount = 0;
         fColors = NULL;
     }
 #ifdef SK_DEBUG
     SkASSERT((unsigned)fCount <= 256);
     SkASSERT(success);
 #endif
 }
 
 void SkColorTable::writeToBuffer(SkWriteBuffer& buffer) const {
     buffer.writeColorArray(fColors, fCount);
 }