Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: gm/tinybitmap.cpp

Issue 26572006: Revert "Revert "change SkColorTable to be immutable"" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/RepeatTileBench.cpp ('k') | include/core/SkAlpha.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/tinybitmap.cpp
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index 26bf25e665f6d8ed7b831b68baa64e34d6750c94..6cb9eded73944c1f7fd400ebbea9842e8755ae72 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -14,13 +14,10 @@
namespace skiagm {
static SkBitmap make_bitmap() {
- SkBitmap bm;
-
- SkColorTable* ctable = new SkColorTable(1);
- SkPMColor* c = ctable->lockColors();
- c[0] = SkPackARGB32(0x80, 0x80, 0, 0);
- ctable->unlockColors(true);
+ const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) };
+ SkColorTable* ctable = new SkColorTable(c, SK_ARRAY_COUNT(c));
+ SkBitmap bm;
bm.setConfig(SkBitmap::kIndex8_Config, 1, 1);
bm.allocPixels(ctable);
ctable->unref();
« no previous file with comments | « bench/RepeatTileBench.cpp ('k') | include/core/SkAlpha.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698