commit deee496cd30070e52556dcb538c2e5eb39b66b81
author mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 13 14:41:43 2014 +0000
committer mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 13 14:41:43 2014 +0000
tree 80f0326a191c966bc34057e4011bdb3233bc2a50
parent b720ffd20829953c9595980422969520f5e33c76

replace setConfig+allocPixels with single call

BUG=skia:

Review URL: https://codereview.chromium.org/162643002

git-svn-id: http://skia.googlecode.com/svn/trunk@13426 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/PictureTest.cpp

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 002fe8f..e540181 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -26,8 +26,7 @@
 static const int gColorOffset = 60;
 
 static void make_bm(SkBitmap* bm, int w, int h, SkColor color, bool immutable) {
-    bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
-    bm->allocPixels();
+    bm->allocN32Pixels(w, h);
     bm->eraseColor(color);
     if (immutable) {
         bm->setImmutable();
@@ -37,8 +36,8 @@
 static void make_checkerboard(SkBitmap* bm, int w, int h, bool immutable) {
     SkASSERT(w % 2 == 0);
     SkASSERT(h % 2 == 0);
-    bm->setConfig(SkBitmap::kA8_Config, w, h);
-    bm->allocPixels();
+    bm->allocPixels(SkImageInfo::Make(w, h, kAlpha_8_SkColorType,
+                                      kPremul_SkAlphaType));
     SkAutoLockPixels lock(*bm);
     for (int y = 0; y < h; y += 2) {
         uint8_t* s = bm->getAddr8(0, y);
@@ -721,7 +720,7 @@
     // This bitmap has a width and height but no pixels. As a result, attempting to record it will
     // fail.
     SkBitmap bm;
-    bm.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
+    bm.setConfig(SkImageInfo::MakeN32Premul(100, 100));
     SkPicture picture;
     SkCanvas* recordingCanvas = picture.beginRecording(100, 100);
     recordingCanvas->drawBitmap(bm, 0, 0);
@@ -1048,7 +1047,7 @@
 static void test_draw_bitmaps(SkCanvas* canvas) {
     SkBitmap empty;
     draw_bitmaps(empty, canvas);
-    empty.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
+    empty.setConfig(SkImageInfo::MakeN32Premul(10, 10));
     draw_bitmaps(empty, canvas);
 }
 
@@ -1060,8 +1059,7 @@
 
 DEF_TEST(Canvas_EmptyBitmap, r) {
     SkBitmap dst;
-    dst.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
-    dst.allocPixels();
+    dst.allocN32Pixels(10, 10);
     SkCanvas canvas(dst);
 
     test_draw_bitmaps(&canvas);