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/ImageFilterTest.cpp

diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 317a877..59504cf 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -70,10 +70,8 @@
 }
 
 static void make_small_bitmap(SkBitmap& bitmap) {
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, kBitmapSize, kBitmapSize);
-    bitmap.allocPixels();
-    SkBitmapDevice device(bitmap);
-    SkCanvas canvas(&device);
+    bitmap.allocN32Pixels(kBitmapSize, kBitmapSize);
+    SkCanvas canvas(bitmap);
     canvas.clear(0x00000000);
     SkPaint darkPaint;
     darkPaint.setColor(0xFF804020);
@@ -159,8 +157,7 @@
         // Tests pass by not asserting
         SkBitmap bitmap, result;
         make_small_bitmap(bitmap);
-        result.setConfig(SkBitmap::kARGB_8888_Config, kBitmapSize, kBitmapSize);
-        result.allocPixels();
+        result.allocN32Pixels(kBitmapSize, kBitmapSize);
 
         {
             // This tests for :
@@ -204,8 +201,7 @@
     // unaffected by the input crop rect.
     // Tests pass by not asserting.
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
-    bitmap.allocPixels();
+    bitmap.allocN32Pixels(100, 100);
     bitmap.eraseARGB(0, 0, 0, 0);
     SkDeviceImageFilterProxy proxy(device);
 
@@ -260,16 +256,14 @@
 
 DEF_TEST(ImageFilterCropRect, reporter) {
     SkBitmap temp;
-    temp.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
-    temp.allocPixels();
+    temp.allocN32Pixels(100, 100);
     SkBitmapDevice device(temp);
     test_crop_rects(&device, reporter);
 }
 
 DEF_TEST(ImageFilterMatrixTest, reporter) {
     SkBitmap temp;
-    temp.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
-    temp.allocPixels();
+    temp.allocN32Pixels(100, 100);
     SkBitmapDevice device(temp);
     SkCanvas canvas(&device);
     canvas.scale(SkIntToScalar(2), SkIntToScalar(2));