Merge SkCodec with SkScanlineDecoder

bench/subset/SubsetSingleBench.cpp

Index: bench/subset/SubsetSingleBench.cpp
diff --git a/bench/subset/SubsetSingleBench.cpp b/bench/subset/SubsetSingleBench.cpp
index ce00f20947dd5a5d426e9643fe921857954c40c4..660265c8222ae8b1daf1b5f78d695a288c79abb0 100644
--- a/bench/subset/SubsetSingleBench.cpp
+++ b/bench/subset/SubsetSingleBench.cpp
@@ -11,7 +11,6 @@
 #include "SkCodec.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
-#include "SkScanlineDecoder.h"
 #include "SkStream.h"
 
 /*
@@ -64,20 +63,19 @@ void SubsetSingleBench::onDraw(const int n, SkCanvas* canvas) {
     SkPMColor colors[256];
     if (fUseCodec) {
         for (int count = 0; count < n; count++) {
-            SkAutoTDelete<SkScanlineDecoder> scanlineDecoder(
-                    SkScanlineDecoder::NewFromStream(fStream->duplicate()));
-            const SkImageInfo info = scanlineDecoder->getInfo().makeColorType(fColorType);
+            SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(fStream->duplicate()));
+            const SkImageInfo info = codec->getInfo().makeColorType(fColorType);
             SkAutoTDeleteArray<uint8_t> row(new uint8_t[info.minRowBytes()]);
-            scanlineDecoder->start(info, nullptr, colors, &colorCount);
+            codec->start(info, nullptr, colors, &colorCount);
 
             SkBitmap bitmap;
             SkImageInfo subsetInfo = info.makeWH(fSubsetWidth, fSubsetHeight);
             alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
 
-            scanlineDecoder->skipScanlines(fOffsetTop);
+            codec->skipScanlines(fOffsetTop);
             uint32_t bpp = info.bytesPerPixel();
             for (uint32_t y = 0; y < fSubsetHeight; y++) {
-                scanlineDecoder->getScanlines(row.get(), 1, 0);
+                codec->getScanlines(row.get(), 1, 0);
                 memcpy(bitmap.getAddr(0, y), row.get() + fOffsetLeft * bpp,
                         fSubsetWidth * bpp);
             }