From 0118e9756d92d3c56b9e05842d7c828f37f68159 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 13 Mar 2018 11:14:33 -0400 Subject: Remove calls to computeOutputColor- Type and Space Bug: b/70846442 Test: I5110881203c000474116a94a48f2afc9a9b62001 These methods were already called by the client. The client may have further overridden the SkColorType (and therefore the SkColorSpace), so respect their final decision on both. Change-Id: Iddcf618e474784b0a000fd516250c44285dacc6b Reviewed-on: https://skia-review.googlesource.com/114062 Commit-Queue: Leon Scroggins Reviewed-by: Derek Sollenberger --- bench/BitmapRegionDecoderBench.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bench/BitmapRegionDecoderBench.cpp') diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp index dd60b18296..d80fc5de4d 100644 --- a/bench/BitmapRegionDecoderBench.cpp +++ b/bench/BitmapRegionDecoderBench.cpp @@ -40,8 +40,10 @@ void BitmapRegionDecoderBench::onDelayedSetup() { } void BitmapRegionDecoderBench::onDraw(int n, SkCanvas* canvas) { + auto ct = fBRD->computeOutputColorType(fColorType); + auto cs = fBRD->computeOutputColorSpace(ct, nullptr); for (int i = 0; i < n; i++) { SkBitmap bm; - SkAssertResult(fBRD->decodeRegion(&bm, nullptr, fSubset, fSampleSize, fColorType, false)); + SkAssertResult(fBRD->decodeRegion(&bm, nullptr, fSubset, fSampleSize, ct, false, cs)); } } -- cgit v1.2.3