diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-05 13:43:15 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-05 13:43:15 +0000 |
| commit | 8ef51b975c2bdb8fa332f091863e5410c18576c7 (patch) | |
| tree | 16d7c9bc2613cb2daa63c44ca71161c88e8df1ea /tests/BitmapGetColorTest.cpp | |
| parent | f1f66c0c8623805fdb88f09c0d87cbdd1745e12b (diff) | |
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
Diffstat (limited to 'tests/BitmapGetColorTest.cpp')
| -rw-r--r-- | tests/BitmapGetColorTest.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp index 8df8661b05..28f3cb309d 100644 --- a/tests/BitmapGetColorTest.cpp +++ b/tests/BitmapGetColorTest.cpp @@ -12,19 +12,19 @@ DEF_TEST(GetColor, reporter) { static const struct Rec { - SkBitmap::Config fConfig; - SkColor fInColor; - SkColor fOutColor; + SkColorType fColorType; + SkColor fInColor; + SkColor fOutColor; } gRec[] = { // todo: add some tests that involve alpha, so we exercise the // unpremultiply aspect of getColor() - { SkBitmap::kA8_Config, 0xFF000000, 0xFF000000 }, - { SkBitmap::kA8_Config, 0, 0 }, - { SkBitmap::kRGB_565_Config, 0xFF00FF00, 0xFF00FF00 }, - { SkBitmap::kRGB_565_Config, 0xFFFF00FF, 0xFFFF00FF }, - { SkBitmap::kARGB_8888_Config, 0xFFFFFFFF, 0xFFFFFFFF }, - { SkBitmap::kARGB_8888_Config, 0, 0 }, - { SkBitmap::kARGB_8888_Config, 0xFF224466, 0xFF224466 }, + { kAlpha_8_SkColorType, 0xFF000000, 0xFF000000 }, + { kAlpha_8_SkColorType, 0, 0 }, + { kRGB_565_SkColorType, 0xFF00FF00, 0xFF00FF00 }, + { kRGB_565_SkColorType, 0xFFFF00FF, 0xFFFF00FF }, + { kPMColor_SkColorType, 0xFFFFFFFF, 0xFFFFFFFF }, + { kPMColor_SkColorType, 0, 0 }, + { kPMColor_SkColorType, 0xFF224466, 0xFF224466 }, }; // specify an area that doesn't touch (0,0) and may extend beyond the @@ -33,10 +33,11 @@ DEF_TEST(GetColor, reporter) { const SkIRect area = { 1, 1, 3, 3 }; for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) { + SkImageInfo info = SkImageInfo::Make(2, 2, gRec[i].fColorType, + kPremul_SkAlphaType); SkBitmap bm; uint32_t storage[4]; - bm.setConfig(gRec[i].fConfig, 2, 2); - bm.setPixels(storage); + bm.installPixels(info, storage, info.minRowBytes(), NULL, NULL); bm.eraseColor(initColor); bm.eraseArea(area, gRec[i].fInColor); |