From 98a6216b18b57c2f7a0d58f542c60503686aed69 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 26 Sep 2017 12:47:08 -0400 Subject: guard old apis for querying byte-size of a bitmap/imageinfo/pixmap Previously we had size_t and uint64_t variations. The new (simpler) API always.. - returns size_t, or 0 if the calculation overflowed - returns the trimmed size (does not include rowBytes padding for the last row) Bug: skia: Change-Id: I05173e877918327c7b207d2f7f1ab0db36892e2e Reviewed-on: https://skia-review.googlesource.com/50980 Commit-Queue: Mike Reed Reviewed-by: Florin Malita Reviewed-by: Leon Scroggins --- tests/RecordingXfermodeTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/RecordingXfermodeTest.cpp') diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp index 20dccc6cc2..25e99ba23d 100644 --- a/tests/RecordingXfermodeTest.cpp +++ b/tests/RecordingXfermodeTest.cpp @@ -151,8 +151,8 @@ DEF_TEST(SkRecordingAccuracyXfermode, reporter) { const SkBitmap& goldenBM = golden.recordAndReplay(drawer, clip, mode); const SkBitmap& pictureBM = picture.recordAndReplay(drawer, clip, mode); - size_t pixelsSize = goldenBM.getSize(); - REPORTER_ASSERT(reporter, pixelsSize == pictureBM.getSize()); + size_t pixelsSize = goldenBM.computeByteSize(); + REPORTER_ASSERT(reporter, pixelsSize == pictureBM.computeByteSize()); // The pixel arrays should match. #if FINEGRAIN -- cgit v1.2.3