Make CodecBench test kPremul and kUnpremul

bench/CodecBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CodecBench.h"
 #include "CodecBenchPriv.h"
 #include "SkBitmap.h"
 #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),

[scroggo, 2016/01/07 20:41:18]

So for a premul, the name will be something like

Codec_file_8888premul

?

Actually, that's not so bad.

[msarett, 2016/01/07 21:00:55]

Yeah it's actually:
N32Premul
N32Unpremul
Index8Premul
Index8Unpremul

Seems fine to me.

+            alpha_type_to_str(alphaType));
 #ifdef SK_DEBUG
     // Ensure that we can create an SkCodec from this data.
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fData));
     SkASSERT(codec);
 #endif
 }
 
 const char* CodecBench::onGetName() {
     return fName.c_str();
 }
 
 bool CodecBench::isSuitableFor(Backend backend) {
     return kNonRendering_Backend == backend;
 }
 
 void CodecBench::onDelayedSetup() {
     SkAutoTDelete<SkCodec> 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()));
 }
 
 void CodecBench::onDraw(int n, SkCanvas* canvas) {
     SkAutoTDelete<SkCodec> codec;
     SkPMColor colorTable[256];
     int colorCount;
     for (int i = 0; i < n; i++) {
         colorCount = 256;
         codec.reset(SkCodec::NewFromData(fData));
 #ifdef SK_DEBUG
         const SkCodec::Result result =
 #endif
         codec->getPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(),
                          nullptr, colorTable, &colorCount);
         SkASSERT(result == SkCodec::kSuccess
                  || result == SkCodec::kIncompleteInput);
     }
 }