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/CanvasTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/CanvasTest.cpp') diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 7aaf554015..9b1e0c9bbb 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -573,7 +573,7 @@ static void TestOverrideStateConsistency(skiatest::Reporter* reporter, const Tes static void test_newraster(skiatest::Reporter* reporter) { SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10); const size_t minRowBytes = info.minRowBytes(); - const size_t size = info.getSafeSize(minRowBytes); + const size_t size = info.computeByteSize(minRowBytes); SkAutoTMalloc storage(size); SkPMColor* baseAddr = storage.get(); sk_bzero(baseAddr, size); -- cgit v1.2.3