Delete dead subset benches from nanobench

bench/subset/SubsetZoomBench.cpp

Index: bench/subset/SubsetZoomBench.cpp
diff --git a/bench/subset/SubsetZoomBench.cpp b/bench/subset/SubsetZoomBench.cpp
index f17a97c26b49d4bbaaceae5369d273520e1fbdef..1712595d7ac69fabee985e8939bf4d535aa690bb 100644
--- a/bench/subset/SubsetZoomBench.cpp
+++ b/bench/subset/SubsetZoomBench.cpp
@@ -24,12 +24,10 @@
 SubsetZoomBench::SubsetZoomBench(const SkString& path,
                                  SkColorType colorType,
                                  uint32_t subsetWidth,
-                                 uint32_t subsetHeight,
-                                 bool useCodec)
+                                 uint32_t subsetHeight)
     : fColorType(colorType)
     , fSubsetWidth(subsetWidth)
     , fSubsetHeight(subsetHeight)
-    , fUseCodec(useCodec)
 {
     // Parse the filename
     SkString baseName = SkOSPath::Basename(path.c_str());
@@ -37,7 +35,7 @@ SubsetZoomBench::SubsetZoomBench(const SkString& path,
     // Choose an informative color name
     const char* colorName = color_type_to_str(fColorType);
 
-    fName.printf("%sSubsetZoom_%dx%d_%s_%s", fUseCodec ? "Codec" : "Image", fSubsetWidth,
+    fName.printf("CodecSubsetZoom_%dx%d_%s_%s", fSubsetWidth,
             fSubsetHeight, baseName.c_str(), colorName);
     
     // Perform the decode setup
@@ -58,71 +56,46 @@ void SubsetZoomBench::onDraw(int n, SkCanvas* canvas) {
     // used, it will be initialized by the codec.
     int colorCount;
     SkPMColor colors[256];
-    if (fUseCodec) {
-        for (int count = 0; count < n; count++) {
-            SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(fStream->duplicate()));
-            SkASSERT(SkCodec::kOutOfOrder_SkScanlineOrder != codec->getScanlineOrder());
-            const SkImageInfo info = codec->getInfo().makeColorType(fColorType);
-
-            const int centerX = info.width() / 2;
-            const int centerY = info.height() / 2;
-            int w = fSubsetWidth;
-            int h = fSubsetHeight;
-            do {
-                const int subsetStartX = SkTMax(0, centerX - w / 2);
-                const int subsetStartY = SkTMax(0, centerY - h / 2);
-                const int subsetWidth = SkTMin(w, info.width() - subsetStartX);
-                const int subsetHeight = SkTMin(h, info.height() - subsetStartY);
-
-                // The scanline decoder will handle subsetting in the x-dimension.
-                SkIRect subset = SkIRect::MakeXYWH(subsetStartX, 0, subsetWidth,
-                        codec->getInfo().height());
-                SkCodec::Options options;
-                options.fSubset = &subset;
-
-                SkDEBUGCODE(SkCodec::Result result = )
-                codec->startScanlineDecode(info, &options, colors, &colorCount);
-                SkASSERT(SkCodec::kSuccess == result);
-
-                // Note that if we subsetted and scaled in a single step, we could use the
-                // same bitmap - as is often done in actual use cases.
-                SkBitmap bitmap;
-                SkImageInfo subsetInfo = info.makeWH(subsetWidth, subsetHeight);
-                alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
-
-                SkDEBUGCODE(bool success = ) codec->skipScanlines(subsetStartY);
-                SkASSERT(success);
-
-                SkDEBUGCODE(int lines = ) codec->getScanlines(bitmap.getPixels(),
-                        subsetHeight, bitmap.rowBytes());
-                SkASSERT(subsetHeight == lines);
-
-                w <<= 1;
-                h <<= 1;
-            } while (w < 2 * info.width() || h < 2 * info.height());
-        }
-    } else {
-        for (int count = 0; count < n; count++) {
-            int width, height;
-            SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
-            SkAssertResult(decoder->buildTileIndex(fStream->duplicate(), &width, &height));
-
-            const int centerX = width / 2;
-            const int centerY = height / 2;
-            int w = fSubsetWidth;
-            int h = fSubsetHeight;
-            do {
-                const int subsetStartX = SkTMax(0, centerX - w / 2);
-                const int subsetStartY = SkTMax(0, centerY - h / 2);
-                const int subsetWidth = SkTMin(w, width - subsetStartX);
-                const int subsetHeight = SkTMin(h, height - subsetStartY);
-                SkBitmap bitmap;
-                SkIRect rect = SkIRect::MakeXYWH(subsetStartX, subsetStartY, subsetWidth,
-                        subsetHeight);
-                SkAssertResult(decoder->decodeSubset(&bitmap, rect, fColorType));
-                w <<= 1;
-                h <<= 1;
-            } while (w < 2 * width || h < 2 * height);
-        }
+    for (int count = 0; count < n; count++) {
+        SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(fStream->duplicate()));
+        SkASSERT(SkCodec::kOutOfOrder_SkScanlineOrder != codec->getScanlineOrder());
+        const SkImageInfo info = codec->getInfo().makeColorType(fColorType);
+
+        const int centerX = info.width() / 2;
+        const int centerY = info.height() / 2;
+        int w = fSubsetWidth;
+        int h = fSubsetHeight;
+        do {
+            const int subsetStartX = SkTMax(0, centerX - w / 2);
+            const int subsetStartY = SkTMax(0, centerY - h / 2);
+            const int subsetWidth = SkTMin(w, info.width() - subsetStartX);
+            const int subsetHeight = SkTMin(h, info.height() - subsetStartY);
+
+            // The scanline decoder will handle subsetting in the x-dimension.
+            SkIRect subset = SkIRect::MakeXYWH(subsetStartX, 0, subsetWidth,
+                    codec->getInfo().height());
+            SkCodec::Options options;
+            options.fSubset = &subset;
+
+            SkDEBUGCODE(SkCodec::Result result = )
+            codec->startScanlineDecode(info, &options, colors, &colorCount);
+            SkASSERT(SkCodec::kSuccess == result);
+
+            // Note that if we subsetted and scaled in a single step, we could use the
+            // same bitmap - as is often done in actual use cases.
+            SkBitmap bitmap;
+            SkImageInfo subsetInfo = info.makeWH(subsetWidth, subsetHeight);
+            alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
+
+            SkDEBUGCODE(bool success = ) codec->skipScanlines(subsetStartY);
+            SkASSERT(success);
+
+            SkDEBUGCODE(int lines = ) codec->getScanlines(bitmap.getPixels(),
+                    subsetHeight, bitmap.rowBytes());
+            SkASSERT(subsetHeight == lines);
+
+            w <<= 1;
+            h <<= 1;
+        } while (w < 2 * info.width() || h < 2 * info.height());
     }
 }