SkCodec no longer inherits from SkImageGenerator.

bench/subset/SubsetZoomBench.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 "SubsetZoomBench.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.
  * Choose subsets to mimic a user zooming in or out on a photo.
  *
  */
 
 SubsetZoomBench::SubsetZoomBench(const SkString& path,
@@ skipping 85 matching lines @@
                 SkBitmap bitmap;
                 SkIRect rect = SkIRect::MakeXYWH(subsetStartX, subsetStartY, subsetWidth,
                         subsetHeight);
                 decoder->decodeSubset(&bitmap, rect, fColorType);
                 w <<= 1;
                 h <<= 1;
             } while (w < 2 * width || h < 2 * height);
         }
     }
 }