Index: bench/BitmapRegionDecoderBench.cpp |
diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp |
index 125c4a84cf887a0624ed7e4d0632c2188614f70f..dd60b18296111ebb13bf7baf300a6ecab5f6d3fd 100644 |
--- a/bench/BitmapRegionDecoderBench.cpp |
+++ b/bench/BitmapRegionDecoderBench.cpp |
@@ -11,34 +11,17 @@ |
#include "SkOSFile.h" |
BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData* encoded, |
- SkBitmapRegionDecoder::Strategy strategy, SkColorType colorType, |
- uint32_t sampleSize, const SkIRect& subset) |
+ SkColorType colorType, uint32_t sampleSize, const SkIRect& subset) |
: fBRD(nullptr) |
, fData(SkRef(encoded)) |
- , fStrategy(strategy) |
, fColorType(colorType) |
, fSampleSize(sampleSize) |
, fSubset(subset) |
{ |
- // Choose a useful name for the region decoding strategy |
- const char* strategyName; |
- switch (strategy) { |
- case SkBitmapRegionDecoder::kCanvas_Strategy: |
- strategyName = "Canvas"; |
- break; |
- case SkBitmapRegionDecoder::kAndroidCodec_Strategy: |
- strategyName = "AndroidCodec"; |
- break; |
- default: |
- SkASSERT(false); |
- strategyName = ""; |
- break; |
- } |
- |
// Choose a useful name for the color type |
const char* colorName = color_type_to_str(colorType); |
- fName.printf("BRD_%s_%s_%s", baseName, strategyName, colorName); |
+ fName.printf("BRD_%s_%s", baseName, colorName); |
if (1 != sampleSize) { |
fName.appendf("_%.3f", 1.0f / (float) sampleSize); |
} |
@@ -53,7 +36,7 @@ bool BitmapRegionDecoderBench::isSuitableFor(Backend backend) { |
} |
void BitmapRegionDecoderBench::onDelayedSetup() { |
- fBRD.reset(SkBitmapRegionDecoder::Create(fData, fStrategy)); |
+ fBRD.reset(SkBitmapRegionDecoder::Create(fData, SkBitmapRegionDecoder::kAndroidCodec_Strategy)); |
} |
void BitmapRegionDecoderBench::onDraw(int n, SkCanvas* canvas) { |