SkCodec no longer inherits from SkImageGenerator.

bench/CodecBench.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 "CodecBench.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
-#include "SkImageGenerator.h"
 #include "SkOSFile.h"
 
 CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType)
     : fColorType(colorType)
     , fData(SkRef(encoded))
 {
     // Parse filename and the color type to give the benchmark a useful name
     const char* colorName;
     switch(colorType) {
         case kN32_SkColorType:
@@ skipping 41 matching lines @@
 }
 
 void CodecBench::onDraw(const int n, SkCanvas* canvas) {
     SkAutoTDelete<SkCodec> codec;
     SkPMColor colorTable[256];
     int colorCount;
     for (int i = 0; i < n; i++) {
         colorCount = 256;
         codec.reset(SkCodec::NewFromData(fData));
 #ifdef SK_DEBUG
-        const SkImageGenerator::Result result =
+        const SkCodec::Result result =
 #endif
         codec->getPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(),
                          NULL, colorTable, &colorCount);
-        SkASSERT(result == SkImageGenerator::kSuccess
-                 || result == SkImageGenerator::kIncompleteInput);
+        SkASSERT(result == SkCodec::kSuccess
+                 || result == SkCodec::kIncompleteInput);
     }
 }