From f0ffb8943b7be477b769db23660a80013f3332eb Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 3 Oct 2017 14:47:21 -0400 Subject: Revert[4] "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap" This reverts commit 5a2e50edc51006ce91366e177a9d21a16775d7fd. Bug: skia: Change-Id: I8d28b5c07d90130e5a1653923740eaf189ecb954 Reviewed-on: https://skia-review.googlesource.com/53900 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/ImageNewShaderTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ImageNewShaderTest.cpp') diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp index 638fa078f0..ff80729d7b 100644 --- a/tests/ImageNewShaderTest.cpp +++ b/tests/ImageNewShaderTest.cpp @@ -17,8 +17,8 @@ #endif static void test_bitmap_equality(skiatest::Reporter* reporter, SkBitmap& bm1, SkBitmap& bm2) { - REPORTER_ASSERT(reporter, bm1.getSize() == bm2.getSize()); - REPORTER_ASSERT(reporter, 0 == memcmp(bm1.getPixels(), bm2.getPixels(), bm1.getSize())); + REPORTER_ASSERT(reporter, bm1.computeByteSize() == bm2.computeByteSize()); + REPORTER_ASSERT(reporter, 0 == memcmp(bm1.getPixels(), bm2.getPixels(), bm1.computeByteSize())); } static void paint_source(SkSurface* sourceSurface) { -- cgit v1.2.3