commit 21027994192f395bbd1507558b84f59b3c7cf0da
author scroggo <scroggo@google.com> Thu Apr 02 13:22:38 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Apr 02 13:22:38 2015 -0700
tree a69071cb3aa375d65d913a884051fd7b521a4709
parent 028a4135aa6404ccd3a494813befe6e1a35e5e6c

Test SkCodec to kIndex8 in nanobench.

BUG=skia:3257
BUG=skia:3475

Review URL: https://codereview.chromium.org/1051973002

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 701128f..bf99a1e 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -540,7 +540,7 @@
 
         // Choose the candidate color types for image decoding
         const SkColorType colorTypes[] =
-            { kN32_SkColorType, kRGB_565_SkColorType, kAlpha_8_SkColorType };
+            { kN32_SkColorType, kRGB_565_SkColorType, kAlpha_8_SkColorType, kIndex_8_SkColorType };
         fColorTypes.push_back_n(SK_ARRAY_COUNT(colorTypes), colorTypes);
     }
 
@@ -644,15 +644,32 @@
                 // Nothing to time.
                 continue;
             }
+
             while (fCurrentColorType < fColorTypes.count()) {
-                SkColorType colorType = fColorTypes[fCurrentColorType];
+                const SkColorType colorType = fColorTypes[fCurrentColorType];
                 fCurrentColorType++;
+
                 // Make sure we can decode to this color type.
-                SkBitmap bitmap;
                 SkImageInfo info = codec->getInfo().makeColorType(colorType);
-                bitmap.allocPixels(info);
+                SkAlphaType alphaType;
+                if (!SkColorTypeValidateAlphaType(colorType, info.alphaType(),
+                                                  &alphaType)) {
+                    continue;
+                }
+                if (alphaType != info.alphaType()) {
+                    info = info.makeAlphaType(alphaType);
+                }
+
+                const size_t rowBytes = info.minRowBytes();
+                SkAutoMalloc storage(info.getSafeSize(rowBytes));
+
+                // Used if fCurrentColorType is kIndex_8_SkColorType
+                int colorCount = 256;
+                SkPMColor colors[256];
+
                 const SkImageGenerator::Result result = codec->getPixels(
-                        bitmap.info(), bitmap.getPixels(), bitmap.rowBytes());
+                        info, storage.get(), rowBytes, NULL, colors,
+                        &colorCount);
                 switch (result) {
                     case SkImageGenerator::kSuccess:
                     case SkImageGenerator::kIncompleteInput: