diff options
| author |  Mike Reed <reed@google.com> | 2017-09-26 17:46:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-27 14:36:07 +0000 |
| commit | 88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch) | |
| tree | a07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /tests/DrawBitmapRectTest.cpp | |
| parent | fa7ee2447e6227e7f441d32e570489130c0932bb (diff) | |
guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Now with legacy behavior for allocpixels
This was reverted, so the current CL is a "fix" on top of ...
https://skia-review.googlesource.com/c/skia/+/50980
Related update to Chrome (in preparation for this change)
https://chromium-review.googlesource.com/c/chromium/src/+/685719
Bug: skia:
Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
Reviewed-on: https://skia-review.googlesource.com/51341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
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) { |