SkCodec no longer inherits from SkImageGenerator.

src/codec/SkCodec_wbmp.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 "SkCodec.h"
 #include "SkColorPriv.h"
 #include "SkStream.h"
@@ skipping 82 matching lines @@
     }
 }
 
 SkWbmpCodec::SkWbmpCodec(const SkImageInfo& info, SkStream* stream)
     : INHERITED(info, stream) {}
 
 SkEncodedFormat SkWbmpCodec::onGetEncodedFormat() const {
     return kWBMP_SkEncodedFormat;
 }
 
-SkImageGenerator::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info,
-                                                  void* pixels,
-                                                  size_t rowBytes,
-                                                  const Options&,
-                                                  SkPMColor ctable[],
-                                                  int* ctableCount) {
+SkCodec::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info,
+                                         void* pixels,
+                                         size_t rowBytes,
+                                         const Options&,
+                                         SkPMColor ctable[],
+                                         int* ctableCount) {
     SkCodec::RewindState rewindState = this->rewindIfNeeded();
     if (rewindState == kCouldNotRewind_RewindState) {
-        return SkImageGenerator::kCouldNotRewind;
+        return kCouldNotRewind;
     } else if (rewindState == kRewound_RewindState) {
         (void)read_header(this->stream(), NULL);
     }
     if (info.dimensions() != this->getInfo().dimensions()) {
-        return SkImageGenerator::kInvalidScale;
+        return kInvalidScale;
     }
     ExpandProc proc = NULL;
     switch (info.colorType()) {
         case kGray_8_SkColorType:
             proc = expand_bits_to_T<uint8_t, bit_to_grayscale>;
             break;
         case kN32_SkColorType:
             proc = expand_bits_to_T<SkPMColor, bit_to_pmcolor>;
             break;
         case kIndex_8_SkColorType:
             ctable[0] = BLACK;
             ctable[1] = WHITE;
             *ctableCount = 2;
             proc = expand_bits_to_T<uint8_t, bit_to_bit>;
             break;
         case kRGB_565_SkColorType:
             proc = expand_bits_to_T<uint16_t, bit_to_rgb565>;
             break;
         default:
-            return SkImageGenerator::kInvalidConversion;
+            return kInvalidConversion;
     }
     SkISize size = info.dimensions();
     uint8_t* dst = static_cast<uint8_t*>(pixels);
     size_t srcRowBytes = SkAlign8(size.width()) >> 3;
     SkAutoTMalloc<uint8_t> src(srcRowBytes);
     for (int y = 0; y < size.height(); ++y) {
         if (this->stream()->read(src.get(), srcRowBytes) != srcRowBytes) {
-            return SkImageGenerator::kIncompleteInput;
+            return kIncompleteInput;
         }
         proc(dst, src.get(), size.width());
         dst += rowBytes;
     }
-    return SkImageGenerator::kSuccess;
+    return kSuccess;
 }
 
 bool SkWbmpCodec::IsWbmp(SkStream* stream) {
     return read_header(stream, NULL);
 }
 
 SkCodec* SkWbmpCodec::NewFromStream(SkStream* stream) {
     SkAutoTDelete<SkStream> streamDeleter(stream);
     SkISize size;
     if (!read_header(stream, &size)) {
         return NULL;
     }
     SkImageInfo info =
             SkImageInfo::Make(size.width(), size.height(), kGray_8_SkColorType,
                               kOpaque_SkAlphaType);
     return SkNEW_ARGS(SkWbmpCodec, (info, streamDeleter.detach()));
 }