add legacy/helper allocN32Pixels, and convert gm to use it
This is an intermediate api, but might help us quickly get to a point where
no one is creating bitmaps in a 2-step process (setConfig + alloc).
BUG=skia:
R=halcanary@google.com
Review URL: https://codereview.chromium.org/140593005
git-svn-id: http://skia.googlecode.com/svn/trunk@13182 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 9c6d472..e1034a9 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -14,8 +14,7 @@
#include "SkShader.h"
static void make_bitmap(SkBitmap* bitmap) {
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
- bitmap->allocPixels();
+ bitmap->allocN32Pixels(64, 64);
SkCanvas canvas(*bitmap);
@@ -100,10 +99,7 @@
};
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, gXSize, gYSize);
- bitmap->allocPixels();
-
- SkAutoLockPixels lock(*bitmap);
+ bitmap->allocN32Pixels(gXSize, gYSize);
for (int y = 0; y < gYSize; y++) {
for (int x = 0; x < gXSize; x++) {
*bitmap->getAddr32(x, y) = textureData[x][y];
@@ -157,10 +153,7 @@
static const int gYSize = 4096;
static const int gBorderWidth = 10;
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, gXSize, gYSize);
- bitmap->allocPixels();
-
- SkAutoLockPixels lock(*bitmap);
+ bitmap->allocN32Pixels(gXSize, gYSize);
for (int y = 0; y < gYSize; ++y) {
for (int x = 0; x < gXSize; ++x) {
if (x <= gBorderWidth || x >= gXSize-gBorderWidth ||