commit eb9a46cbbb475e862a084aa2224ec18d4ac5e95b
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Jan 25 16:46:20 2014 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Jan 25 16:46:20 2014 +0000
tree 3e0f1b499eb5567989e23ec5b43977d43f6e3200
parent d2ac07b64b7d46e81d00d389781f9f83810f0095

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

gm/bigmatrix.cpp

diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index 9b49a64..b663b2b 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -59,15 +59,12 @@
         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(