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/SurfaceTest.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/SurfaceTest.cpp')
| -rw-r--r-- | tests/SurfaceTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 202df58f3c..2fd987fdf6 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -50,7 +50,7 @@ static sk_sp<SkSurface> create_direct_surface(SkAlphaType at = kPremul_SkAlphaTy *requestedInfo = info; } const size_t rowBytes = info.minRowBytes(); - void* storage = sk_malloc_throw(info.getSafeSize(rowBytes)); + void* storage = sk_malloc_throw(info.computeByteSize(rowBytes)); return SkSurface::MakeRasterDirectReleaseProc(info, storage, rowBytes, release_direct_surface_storage, storage); @@ -565,7 +565,7 @@ DEF_TEST(surface_rowbytes, reporter) { // Try some illegal rowByte values auto s = SkSurface::MakeRaster(info, 396, nullptr); // needs to be at least 400 REPORTER_ASSERT(reporter, nullptr == s); - s = SkSurface::MakeRaster(info, 1 << 30, nullptr); // allocation to large + s = SkSurface::MakeRaster(info, std::numeric_limits<size_t>::max(), nullptr); REPORTER_ASSERT(reporter, nullptr == s); } |