Revert "Revert "change SkColorTable to be immutable""
This reverts commit b8162cb840f4cb6002ef68d5ac775c6a122c52a9.
Fixed was call-sites in benches that used the (now gone) setIsOpaque api.
R=scroggo@google.com
Review URL: https://codereview.chromium.org/26572006
git-svn-id: http://skia.googlecode.com/svn/trunk@11695 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp
index c311c4a..612a149 100644
--- a/bench/RepeatTileBench.cpp
+++ b/bench/RepeatTileBench.cpp
@@ -52,9 +52,10 @@
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);
@@ -66,7 +67,8 @@
}
}
}
- 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();
@@ -119,7 +121,7 @@
if (SkBitmap::kIndex8_Config == fConfig) {
SkBitmap tmp;
- convert_to_index666(fBitmap, &tmp);
+ convert_to_index666(fBitmap, &tmp, fIsOpaque);
fBitmap = tmp;
}