diff options
author | Jim Van Verth <jvanverth@google.com> | 2017-09-27 22:13:44 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-27 23:15:07 +0000 |
commit | 809cbedd4b252be221b2ac3b4269d312fd8f53a0 (patch) | |
tree | 66ff73d8acfd81ebf76afd36d44a06709a4ba457 /bench | |
parent | 6ca9c6f41224050d92cae548e915f5b9175efe8b (diff) |
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 <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
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 <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'bench')
-rw-r--r-- | bench/AndroidCodecBench.cpp | 2 | ||||
-rw-r--r-- | bench/CodecBench.cpp | 2 | ||||
-rw-r--r-- | bench/ColorCodecBench.cpp | 4 | ||||
-rw-r--r-- | bench/nanobench.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
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) { diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index 708ab60870..29443746f7 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -43,7 +43,7 @@ void CodecBench::onDelayedSetup() { .makeAlphaType(fAlphaType) .makeColorSpace(nullptr); - fPixelStorage.reset(fInfo.computeMinByteSize()); + fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); } void CodecBench::onDraw(int n, SkCanvas* canvas) { diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index 1239e1d4fe..680c1d916f 100644 --- a/bench/ColorCodecBench.cpp +++ b/bench/ColorCodecBench.cpp @@ -88,10 +88,10 @@ void ColorCodecBench::onDelayedSetup() { fDstSpace = static_cast<SkColorSpace_XYZ*>(fDstSpace.get())->makeLinearGamma(); } - fDst.reset(fDstInfo.computeMinByteSize()); + fDst.reset(fDstInfo.getSafeSize(fDstInfo.minRowBytes())); if (FLAGS_xform_only) { - fSrc.reset(fSrcInfo.computeMinByteSize()); + fSrc.reset(fSrcInfo.getSafeSize(fSrcInfo.minRowBytes())); fSrcSpace = codec->getInfo().refColorSpace(); codec->getPixels(fSrcInfo, fSrc.get(), fSrcInfo.minRowBytes()); } diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 2dc41bb8c0..04583309ce 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -887,7 +887,7 @@ public: SkImageInfo info = codec->getInfo().makeColorType(colorType).makeAlphaType(alphaType); const size_t rowBytes = info.minRowBytes(); - SkAutoMalloc storage(info.computeByteSize(rowBytes)); + SkAutoMalloc storage(info.getSafeSize(rowBytes)); const SkCodec::Result result = codec->getPixels( info, storage.get(), rowBytes); |