replace setConfig+allocPixels with alloc-or-install-pixels
BUG=skia:
R=scroggo@google.com, halcanary@google.com, reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/164203003
git-svn-id: http://skia.googlecode.com/svn/trunk@13442 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 5f25007..50f55fd 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -107,8 +107,7 @@
static void fillCanvas(SkCanvas* canvas) {
static SkBitmap bmp;
if (bmp.isNull()) {
- bmp.setConfig(SkBitmap::kARGB_8888_Config, DEV_W, DEV_H);
- SkDEBUGCODE(bool alloc =) bmp.allocPixels();
+ SkDEBUGCODE(bool alloc =) bmp.allocN32Pixels(DEV_W, DEV_H);
SkASSERT(alloc);
SkAutoLockPixels alp(bmp);
intptr_t pixels = reinterpret_cast<intptr_t>(bmp.getPixels());
@@ -230,9 +229,8 @@
}
static void init_bitmap(SkBitmap* bitmap, const SkIRect& rect, BitmapInit init) {
- int w = rect.width();
- int h = rect.height();
- int rowBytes = 0;
+ SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
+ size_t rowBytes = 0;
bool alloc = true;
switch (init) {
case kNoPixels_BitmapInit:
@@ -240,15 +238,17 @@
case kTight_BitmapInit:
break;
case kRowBytes_BitmapInit:
- rowBytes = w * sizeof(SkPMColor) + 16 * sizeof(SkPMColor);
+ rowBytes = (info.width() + 16) * sizeof(SkPMColor);
break;
default:
SkASSERT(0);
break;
}
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, w, h, rowBytes);
+
if (alloc) {
- bitmap->allocPixels();
+ bitmap->allocPixels(info);
+ } else {
+ bitmap->setConfig(info, rowBytes);
}
}