Revert "Revert "change SkColorTable to be immutable""

gm/tinybitmap.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 "gm.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 #include "SkCanvas.h"
 #include "SkUtils.h"
 
 namespace skiagm {
 
 static SkBitmap make_bitmap() {
+    const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) };
+    SkColorTable* ctable = new SkColorTable(c, SK_ARRAY_COUNT(c));
+
     SkBitmap bm;
-
-    SkColorTable* ctable = new SkColorTable(1);
-    SkPMColor* c = ctable->lockColors();
-    c[0] = SkPackARGB32(0x80, 0x80, 0, 0);
-    ctable->unlockColors(true);
-
     bm.setConfig(SkBitmap::kIndex8_Config, 1, 1);
     bm.allocPixels(ctable);
     ctable->unref();
 
     bm.lockPixels();
     *bm.getAddr8(0, 0) = 0;
     bm.unlockPixels();
     return bm;
 }
 
@@ skipping 24 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new TinyBitmapGM; }
 static GMRegistry reg(MyFactory);
 
 }