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 --- bench/AndroidCodecBench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bench/AndroidCodecBench.cpp') diff --git a/bench/AndroidCodecBench.cpp b/bench/AndroidCodecBench.cpp index 886e875c6d..d9abac63d8 100644 --- a/bench/AndroidCodecBench.cpp +++ b/bench/AndroidCodecBench.cpp @@ -38,7 +38,7 @@ void AndroidCodecBench::onDelayedSetup() { fInfo = fInfo.makeAlphaType(kPremul_SkAlphaType); } - fPixelStorage.reset(fInfo.computeMinByteSize()); + fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); } void AndroidCodecBench::onDraw(int n, SkCanvas* canvas) { -- cgit v1.2.3