From 809cbedd4b252be221b2ac3b4269d312fd8f53a0 Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Wed, 27 Sep 2017 22:13:44 +0000 Subject: Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap" This reverts commit 88757dacd4f532a0f647c02ae0ee596d31ab5c68. Reason for revert: Still seems to be failing Chromium "telemetry_perf_unittests (with patch) on Android" on android_n5x_swarming_rel. Original change's description: > 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 TBR=fmalita@chromium.org,reed@google.com Change-Id: I827a0ca1d1e3909e648fde3342cdb8601d34da8d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/52381 Reviewed-by: Jim Van Verth Commit-Queue: Jim Van Verth --- tests/MallocPixelRefTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/MallocPixelRefTest.cpp') diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp index ac080994e2..957c8b3948 100644 --- a/tests/MallocPixelRefTest.cpp +++ b/tests/MallocPixelRefTest.cpp @@ -32,7 +32,7 @@ DEF_TEST(MallocPixelRef, reporter) { } { size_t rowBytes = info.minRowBytes() - 1; - size_t size = info.computeByteSize(rowBytes); + size_t size = info.getSafeSize(rowBytes); sk_sp data(SkData::MakeUninitialized(size)); sk_sp pr( SkMallocPixelRef::MakeWithData(info, rowBytes, data)); @@ -41,7 +41,7 @@ DEF_TEST(MallocPixelRef, reporter) { } { size_t rowBytes = info.minRowBytes() + 2; - size_t size = info.computeByteSize(rowBytes) - 1; + size_t size = info.getSafeSize(rowBytes) - 1; sk_sp data(SkData::MakeUninitialized(size)); sk_sp pr( SkMallocPixelRef::MakeWithData(info, rowBytes, data)); @@ -49,7 +49,7 @@ DEF_TEST(MallocPixelRef, reporter) { REPORTER_ASSERT(reporter, nullptr == pr.get()); } size_t rowBytes = info.minRowBytes() + 7; - size_t size = info.computeByteSize(rowBytes) + 9; + size_t size = info.getSafeSize(rowBytes) + 9; { SkAutoMalloc memory(size); sk_sp pr( -- cgit v1.2.3