Revert "Revert "change SkColorTable to be immutable""

bench/RepeatTileBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 34 matching lines @@
 }
 
 static uint8_t compute_666_index(SkPMColor c) {
     int r = SkGetPackedR32(c);
     int g = SkGetPackedG32(c);
     int b = SkGetPackedB32(c);
 
     return conv_byte_to_6(r) * 36 + conv_byte_to_6(g) * 6 + conv_byte_to_6(b);
 }
 
-static void convert_to_index666(const SkBitmap& src, SkBitmap* dst) {
-    SkColorTable* ctable = new SkColorTable(216);
-    SkPMColor* colors = ctable->lockColors();
+static void convert_to_index666(const SkBitmap& src, SkBitmap* dst,
+                                bool isOpaque) {
+    SkPMColor storage[216];
+    SkPMColor* colors = storage;
     // rrr ggg bbb
     for (int r = 0; r < 6; r++) {
         int rr = conv_6_to_byte(r);
         for (int g = 0; g < 6; g++) {
             int gg = conv_6_to_byte(g);
             for (int b = 0; b < 6; b++) {
                 int bb = conv_6_to_byte(b);
                 *colors++ = SkPreMultiplyARGB(0xFF, rr, gg, bb);
             }
         }
     }
-    ctable->unlockColors(true);
+    SkAlphaType aType = isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+    SkColorTable* ctable = new SkColorTable(storage, 216, aType);
     dst->setConfig(SkBitmap::kIndex8_Config, src.width(), src.height());
     dst->allocPixels(ctable);
     ctable->unref();
 
     SkAutoLockPixels alps(src);
     SkAutoLockPixels alpd(*dst);
 
     for (int y = 0; y < src.height(); y++) {
         const SkPMColor* srcP = src.getAddr32(0, y);
         uint8_t* dstP = dst->getAddr8(0, y);
@@ skipping 32 matching lines @@
 
     virtual void onPreDraw() SK_OVERRIDE {
         fBitmap.allocPixels();
         fBitmap.eraseColor(fIsOpaque ? SK_ColorWHITE : 0);
         fBitmap.setIsOpaque(fIsOpaque);
 
         draw_into_bitmap(fBitmap);
 
         if (SkBitmap::kIndex8_Config == fConfig) {
             SkBitmap tmp;
-            convert_to_index666(fBitmap, &tmp);
+            convert_to_index666(fBitmap, &tmp, fIsOpaque);
             fBitmap = tmp;
         }
 
         SkShader* s = SkShader::CreateBitmapShader(fBitmap,
                                                    SkShader::kRepeat_TileMode,
                                                    SkShader::kRepeat_TileMode);
         fPaint.setShader(s)->unref();
     }
 
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
 
         for (int i = 0; i < this->getLoops(); i++) {
             canvas->drawPaint(paint);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, true))
 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, false))
 DEF_BENCH(return new RepeatTileBench(SkBitmap::kRGB_565_Config))
 DEF_BENCH(return new RepeatTileBench(SkBitmap::kIndex8_Config))