From 88757dacd4f532a0f647c02ae0ee596d31ab5c68 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 26 Sep 2017 17:46:02 -0400 Subject: 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 Commit-Queue: Mike Reed --- tests/CodecTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/CodecTest.cpp') diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index f2551d2d95..6e253d29c6 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -588,7 +588,7 @@ static void test_dimensions(skiatest::Reporter* r, const char path[]) { // Set up for the decode size_t rowBytes = scaledDims.width() * sizeof(SkPMColor); - size_t totalBytes = scaledInfo.getSafeSize(rowBytes); + size_t totalBytes = scaledInfo.computeByteSize(rowBytes); SkAutoTMalloc pixels(totalBytes); SkAndroidCodec::AndroidOptions options; @@ -1015,7 +1015,7 @@ static void check_color_xform(skiatest::Reporter* r, const char* path) { .makeColorSpace(colorSpace); size_t rowBytes = dstInfo.minRowBytes(); - SkAutoMalloc pixelStorage(dstInfo.getSafeSize(rowBytes)); + SkAutoMalloc pixelStorage(dstInfo.computeByteSize(rowBytes)); SkCodec::Result result = codec->getAndroidPixels(dstInfo, pixelStorage.get(), rowBytes, &opts); REPORTER_ASSERT(r, SkCodec::kSuccess == result); } -- cgit v1.2.3