diff options
| author |  Mike Reed <reed@google.com> | 2017-09-29 15:22:56 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 12:55:37 +0000 |
| commit | cd284c532376d16fcc4ed75baf3da65c3e4a2e95 (patch) | |
| tree | 5c7e34122e72cef44f279b1aa32638d765d3c639 /tests/DrawBitmapRectTest.cpp | |
| parent | 3c83668862521b3bbbd628a522c05688348d6e7f (diff) | |
Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
This reverts commit 809cbedd4b252be221b2ac3b4269d312fd8f53a0.
Bug: skia:
Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
Reviewed-on: https://skia-review.googlesource.com/52665
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tests/DrawBitmapRectTest.cpp')
| -rw-r--r-- | tests/DrawBitmapRectTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index 991290142e..8ad177f5c1 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -144,9 +144,10 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, SkBitmap bm; if (bm.tryAllocN32Pixels(width, height)) { - // allow this to fail silently, to test the code downstream + bm.eraseColor(SK_ColorRED); + } else { + shouldBeDrawn = false; } - bm.eraseColor(SK_ColorRED); matrix.setAll(0.0078740157f, 0, @@ -179,7 +180,7 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, * sign-extension bleed when packing the two values (X,Y) into our 32bit * slot. * - * This tests exercises the original setup, plus 3 more to ensure that we can, + * This tests exercises the original setup, plus 2 more to ensure that we can, * in fact, handle bitmaps at 64K-1 (assuming we don't exceed the total * memory allocation limit). */ @@ -192,7 +193,6 @@ static void test_giantrepeat_crbug118018(skiatest::Reporter* reporter) { { 0x1b294, 0x7f, false }, // crbug 118018 (width exceeds 64K) { 0xFFFF, 0x7f, true }, // should draw, test max width { 0x7f, 0xFFFF, true }, // should draw, test max height - { 0xFFFF, 0xFFFF, false }, // allocation fails (too much RAM) }; for (size_t i = 0; i < SK_ARRAY_COUNT(gTests); ++i) { |