Stop benching PNG buildTileIndex by default

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 93 matching lines @@
 DEFINE_string(clip, "0,0,1000,1000", "Clip for SKPs.");
 DEFINE_string(scales, "1.0", "Space-separated scales for SKPs.");
 DEFINE_string(zoom, "1.0,0", "Comma-separated zoomMax,zoomPeriodMs factors for a periodic SKP zoom "
                              "function that ping-pongs between 1.0 and zoomMax.");
 DEFINE_bool(bbh, true, "Build a BBH for SKPs?");
 DEFINE_bool(mpd, true, "Use MultiPictureDraw for the SKPs?");
 DEFINE_bool(loopSKP, true, "Loop SKPs like we do for micro benches?");
 DEFINE_int32(flushEvery, 10, "Flush --outResultsFile every Nth run.");
 DEFINE_bool(resetGpuContext, true, "Reset the GrContext before running each test.");
 DEFINE_bool(gpuStats, false, "Print GPU stats after each gpu benchmark?");
+DEFINE_bool(pngBuildTileIndex, false, "If supported, use png buildTileIndex/decodeSubset.");
 
 static SkString humanize(double ms) {
     if (FLAGS_verbose) return SkStringPrintf("%llu", (uint64_t)(ms*1e6));
     return HumanizeMs(ms);
 }
 #define HUMANIZE(ms) humanize(ms).c_str()
 
 bool Target::init(SkImageInfo info, Benchmark* bench) {
     if (Benchmark::kRaster_Backend == config.backend) {
         this->surface.reset(SkSurface::NewRaster(info));
@@ skipping 377 matching lines @@
 }
 
 /*
  * We only run our subset benches on files that are supported by BitmapRegionDecoder:
  * i.e. PNG, JPEG, and WEBP. We do *not* test WEBP when using codec, since we do not
  * have a scanline decoder for WEBP, which is necessary for running the subset bench.
  * (Another bench must be used to test WEBP, which decodes subsets natively.)
  */
 static bool run_subset_bench(const SkString& path, bool useCodec) {
     static const char* const exts[] = {
-        "jpg", "jpeg", "png",
-        "JPG", "JPEG", "PNG",
+        "jpg", "jpeg",
+        "JPG", "JPEG",
     };
 
     for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
         if (path.endsWith(exts[i])) {
             return true;
         }
     }
 
-    return !useCodec && (path.endsWith("webp") || path.endsWith("WEBP"));
+    // Test png in SkCodec, and optionally on SkImageDecoder. SkImageDecoder is
+    // disabled by default because it leaks memory.
+    // skbug.com/4360
+    if ((useCodec || FLAGS_pngBuildTileIndex) && (path.endsWith("png") || path.endsWith("PNG"))) {
+        return true;
+    }
+
+    if (!useCodec && (path.endsWith("webp") || path.endsWith("WEBP"))) {
+        return true;
+    }
+
+    return false;
 }
 
 /*
  * Returns true if set up for a subset decode succeeds, false otherwise
  * If the set-up succeeds, the width and height parameters will be set
  */
 static bool valid_subset_bench(const SkString& path, SkColorType colorType, bool useCodec,
         int* width, int* height) {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
     SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(encoded));
@@ skipping 795 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif