SkCodec no longer inherits from SkImageGenerator.

bench/subset/SubsetSingleBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SubsetSingleBench.h"
 #include "SubsetBenchPriv.h"
 #include "SkData.h"
 #include "SkCodec.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
+#include "SkScanlineDecoder.h"
 #include "SkStream.h"
 
 /*
  *
  * This benchmark is designed to test the performance of subset decoding.
  * It uses an input width, height, left, and top to decode a single subset.
  *
  */
 
 SubsetSingleBench::SubsetSingleBench(const SkString& path,
@@ skipping 62 matching lines @@
             SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
             int width, height;
             decoder->buildTileIndex(fStream->duplicate(), &width, &height);
             SkBitmap bitmap;
             SkIRect rect = SkIRect::MakeXYWH(fOffsetLeft, fOffsetTop, fSubsetWidth,
                     fSubsetHeight);
             decoder->decodeSubset(&bitmap, rect, fColorType);
         }
     }
 }