From c7796b93f02e736df967301d3c46cec46dd02d5c Mon Sep 17 00:00:00 2001 From: msarett Date: Thu, 7 Jan 2016 14:20:20 -0800 Subject: Make CodecBench test kPremul and kUnpremul BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1568913002 Review URL: https://codereview.chromium.org/1568913002 --- bench/CodecBench.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'bench/CodecBench.cpp') diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index 1384480f43..66831fb24c 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -11,12 +11,15 @@ #include "SkCodec.h" #include "SkOSFile.h" -CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType) +CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType, + SkAlphaType alphaType) : fColorType(colorType) + , fAlphaType(alphaType) , fData(SkRef(encoded)) { // Parse filename and the color type to give the benchmark a useful name - fName.printf("Codec_%s_%s", baseName.c_str(), color_type_to_str(colorType)); + fName.printf("Codec_%s_%s%s", baseName.c_str(), color_type_to_str(colorType), + alpha_type_to_str(alphaType)); #ifdef SK_DEBUG // Ensure that we can create an SkCodec from this data. SkAutoTDelete codec(SkCodec::NewFromData(fData)); @@ -35,15 +38,7 @@ bool CodecBench::isSuitableFor(Backend backend) { void CodecBench::onDelayedSetup() { SkAutoTDelete codec(SkCodec::NewFromData(fData)); - fInfo = codec->getInfo().makeColorType(fColorType); - SkAlphaType alphaType; - // Caller should not have created this CodecBench if the alpha type was - // invalid. - SkAssertResult(SkColorTypeValidateAlphaType(fColorType, fInfo.alphaType(), - &alphaType)); - if (alphaType != fInfo.alphaType()) { - fInfo = fInfo.makeAlphaType(alphaType); - } + fInfo = codec->getInfo().makeColorType(fColorType).makeAlphaType(fAlphaType); fPixelStorage.reset(fInfo.getSafeSize(fInfo.minRowBytes())); } -- cgit v1.2.3