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/SwizzlerTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/SwizzlerTest.cpp') diff --git a/tests/SwizzlerTest.cpp b/tests/SwizzlerTest.cpp index 655c97eadd..8950efb153 100644 --- a/tests/SwizzlerTest.cpp +++ b/tests/SwizzlerTest.cpp @@ -28,7 +28,7 @@ static void check_fill(skiatest::Reporter* r, // to test on different memory alignments. If offset is nonzero, we need to increase the // size of the memory we allocate in order to make sure that we have enough. We are // still allocating the smallest possible size. - const size_t totalBytes = imageInfo.getSafeSize(rowBytes) + offset; + const size_t totalBytes = imageInfo.computeByteSize(rowBytes) + offset; // Create fake image data where every byte has a value of 0 std::unique_ptr storage(new uint8_t[totalBytes]); -- cgit v1.2.3