aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/bigmatrix.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-25 16:46:20 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-25 16:46:20 +0000
commiteb9a46cbbb475e862a084aa2224ec18d4ac5e95b (patch)
tree3e0f1b499eb5567989e23ec5b43977d43f6e3200 /gm/bigmatrix.cpp
parentd2ac07b64b7d46e81d00d389781f9f83810f0095 (diff)
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
Diffstat (limited to 'gm/bigmatrix.cpp')
-rw-r--r--gm/bigmatrix.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index 9b49a64ea2..b663b2b1ef 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -59,15 +59,12 @@ protected:
canvas->drawRect(rect, paint);
SkBitmap bmp;
- bmp.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
- bmp.allocPixels();
- bmp.lockPixels();
+ bmp.allocN32Pixels(2, 2);
uint32_t* pixels = reinterpret_cast<uint32_t*>(bmp.getPixels());
pixels[0] = SkPackARGB32(0xFF, 0xFF, 0x00, 0x00);
pixels[1] = SkPackARGB32(0xFF, 0x00, 0xFF, 0x00);
pixels[2] = SkPackARGB32(0x80, 0x00, 0x00, 0x00);
pixels[3] = SkPackARGB32(0xFF, 0x00, 0x00, 0xFF);
- bmp.unlockPixels();
pt.set(30 * SK_Scalar1, 30 * SK_Scalar1);
m.mapPoints(&pt, 1);
SkShader* shader = SkShader::CreateBitmapShader(