remove deprecated use of bitmap config from tests
BUG=skia:
R=halcanary@google.com, reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/184233003
git-svn-id: http://skia.googlecode.com/svn/trunk@13666 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp
index 2c1f4a3..e39439a 100644
--- a/tests/BitmapHasherTest.cpp
+++ b/tests/BitmapHasherTest.cpp
@@ -15,12 +15,11 @@
typedef uint64_t checksum_result;
// Fill in bitmap with test data.
-static void CreateTestBitmap(SkBitmap &bitmap, SkBitmap::Config config, int width, int height,
+static void CreateTestBitmap(SkBitmap* bitmap, int width, int height,
SkColor color, skiatest::Reporter* reporter) {
- bitmap.setConfig(config, width, height);
- REPORTER_ASSERT(reporter, bitmap.allocPixels());
- bitmap.setAlphaType(kOpaque_SkAlphaType);
- bitmap.eraseColor(color);
+ SkImageInfo info = SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType);
+ REPORTER_ASSERT(reporter, bitmap->allocPixels(info));
+ bitmap->eraseColor(color);
}
DEF_TEST(BitmapHasher, reporter) {
@@ -28,15 +27,15 @@
SkBitmap bitmap;
uint64_t digest;
// initial test case
- CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 333, 555, SK_ColorBLUE, reporter);
+ CreateTestBitmap(&bitmap, 333, 555, SK_ColorBLUE, reporter);
REPORTER_ASSERT(reporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
REPORTER_ASSERT(reporter, digest == 0xfb2903562766ef87ULL);
// same pixel data but different dimensions should yield a different checksum
- CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorBLUE, reporter);
+ CreateTestBitmap(&bitmap, 555, 333, SK_ColorBLUE, reporter);
REPORTER_ASSERT(reporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
REPORTER_ASSERT(reporter, digest == 0xfe04023fb97d0f61ULL);
// same dimensions but different color should yield a different checksum
- CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN, reporter);
+ CreateTestBitmap(&bitmap, 555, 333, SK_ColorGREEN, reporter);
REPORTER_ASSERT(reporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
REPORTER_ASSERT(reporter, digest == 0x2423c51cad6d1edcULL);
}