Test SkCodec to kIndex8 in nanobench.

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 522 matching lines @@
                     fImages.push_back() = SkOSPath::Join(flag, file.c_str());
                 }
             } else if (sk_exists(flag)) {
                 // Also add the value if it is a single image
                 fImages.push_back() = flag;
             }
         }
 
         // 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);
     }
 
     static bool ReadPicture(const char* path, SkAutoTUnref<SkPicture>* pic) {
         // Not strictly necessary, as it will be checked again later,
         // but helps to avoid a lot of pointless work if we're going to skip it.
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
             return false;
         }
 
@@ skipping 83 matching lines @@
 
         for (; fCurrentCodec < fImages.count(); fCurrentCodec++) {
             const SkString& path = fImages[fCurrentCodec];
             SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
             SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
             SkASSERT(codec);
             if (!codec) {
                 // 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:
                         return new CodecBench(SkOSPath::Basename(path.c_str()),
                                 encoded, colorType);
                     case SkImageGenerator::kInvalidConversion:
                         // This is okay. Not all conversions are valid.
                         break;
                     case SkImageGenerator::kCouldNotRewind:
                         // FIXME: This is due to a bug in some implementations
@@ skipping 313 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif