replace setConfig+allocPixels with single call

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkError.h"
 #include "SkImageEncoder.h"
 #include "SkImageGenerator.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureUtils.h"
 #include "SkRRect.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "Test.h"
 
 static const int gColorScale = 30;
 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();
     }
 }
 
 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);
         for (int x = 0; x < w; x += 2) {
             *s++ = 0xFF;
             *s++ = 0x00;
         }
         s = bm->getAddr8(0, y + 1);
         for (int x = 0; x < w; x += 2) {
             *s++ = 0x00;
@@ skipping 662 matching lines @@
     }
 }
 
 #ifndef SK_DEBUG
 // Only test this is in release mode. We deliberately crash in debug mode, since a valid caller
 // should never do this.
 static void test_bad_bitmap() {
     // 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);
     picture.endRecording();
 
     SkCanvas canvas;
     canvas.drawPicture(picture);
 }
 #endif
 
@@ skipping 306 matching lines @@
     canvas->drawBitmap(bitmap, 0.0f, 0.0f, &paint);
     canvas->drawBitmapRectToRect(bitmap, &rect, rect, &paint, SkCanvas::kNone_DrawBitmapRectFlag);
     canvas->drawBitmapMatrix(bitmap, SkMatrix::I(), &paint);
     canvas->drawBitmapNine(bitmap, irect, rect, &paint);
     canvas->drawSprite(bitmap, 1, 1);
 }
 
 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);
 }
 
 DEF_TEST(Picture_EmptyBitmap, r) {
     SkPicture picture;
     test_draw_bitmaps(picture.beginRecording(10, 10));
     picture.endRecording();
 }
 
 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);
 }