SkCodec no longer inherits from SkImageGenerator.

tests/CodexTest.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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
 #include "SkMD5.h"
+#include "SkScanlineDecoder.h"
 #include "Test.h"
 
 static SkStreamAsset* resource(const char path[]) {
     SkString fullPath = GetResourcePath(path);
     return SkStream::NewFromFile(fullPath.c_str());
 }
 
 static void md5(const SkBitmap& bm, SkMD5::Digest* digest) {
     SkAutoLockPixels autoLockPixels(bm);
     SkASSERT(bm.getPixels());
@@ skipping 22 matching lines @@
 
     // This test is used primarily to verify rewinding works properly.  Using kN32 allows
     // us to test this without the added overhead of creating different bitmaps depending
     // on the color type (ex: building a color table for kIndex8).  DM is where we test
     // decodes to all possible destination color types.
     SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
     REPORTER_ASSERT(r, info.dimensions() == size);
     SkBitmap bm;
     bm.allocPixels(info);
     SkAutoLockPixels autoLockPixels(bm);
-    SkImageGenerator::Result result =
+    SkCodec::Result result =
         codec->getPixels(info, bm.getPixels(), bm.rowBytes(), NULL, NULL, NULL);
-    REPORTER_ASSERT(r, result == SkImageGenerator::kSuccess);
+    REPORTER_ASSERT(r, result == SkCodec::kSuccess);
 
     SkMD5::Digest digest1, digest2;
     md5(bm, &digest1);
 
     bm.eraseColor(SK_ColorYELLOW);
 
     result =
         codec->getPixels(info, bm.getPixels(), bm.rowBytes(), NULL, NULL, NULL);
 
-    REPORTER_ASSERT(r, result == SkImageGenerator::kSuccess);
+    REPORTER_ASSERT(r, result == SkCodec::kSuccess);
     // verify that re-decoding gives the same result.
     md5(bm, &digest2);
     REPORTER_ASSERT(r, digest1 == digest2);
 
     SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(info);
     if (supportsScanlineDecoding) {
         bm.eraseColor(SK_ColorYELLOW);
         REPORTER_ASSERT(r, scanlineDecoder);
 
         // Regular decodes should be disabled after creating a scanline decoder
         result = codec->getPixels(info, bm.getPixels(), bm.rowBytes(), NULL, NULL, NULL);
-        REPORTER_ASSERT(r, SkImageGenerator::kInvalidParameters == result);
+        REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
         for (int y = 0; y < info.height(); y++) {
             result = scanlineDecoder->getScanlines(bm.getAddr(0, y), 1, 0);
-            REPORTER_ASSERT(r, result == SkImageGenerator::kSuccess);
+            REPORTER_ASSERT(r, result == SkCodec::kSuccess);
         }
         // verify that scanline decoding gives the same result.
         SkMD5::Digest digest3;
         md5(bm, &digest3);
         REPORTER_ASSERT(r, digest3 == digest1);
     } else {
         REPORTER_ASSERT(r, !scanlineDecoder);
     }
 }
 
@@ skipping 90 matching lines @@
     for (float scale = -0.05f; scale < 2.0f; scale += 0.05f) {
         // Scale the output dimensions
         SkISize scaledDims = codec->getScaledDimensions(scale);
         SkImageInfo scaledInfo = codec->getInfo().makeWH(scaledDims.width(), scaledDims.height());
 
         // Set up for the decode
         size_t rowBytes = scaledDims.width() * sizeof(SkPMColor);
         size_t totalBytes = scaledInfo.getSafeSize(rowBytes);
         SkAutoTMalloc<SkPMColor> pixels(totalBytes);
 
-        SkImageGenerator::Result result =
+        SkCodec::Result result =
                 codec->getPixels(scaledInfo, pixels.get(), rowBytes, NULL, NULL, NULL);
-        REPORTER_ASSERT(r, SkImageGenerator::kSuccess == result);
+        REPORTER_ASSERT(r, SkCodec::kSuccess == result);
     }
 }
 
 // Ensure that onGetScaledDimensions returns valid image dimensions to use for decodes
 DEF_TEST(Codec_Dimensions, r) {
     // JPG
     test_dimensions(r, "CMYK.jpg");
     test_dimensions(r, "color_wheel.jpg");
     test_dimensions(r, "grayscale.jpg");
     test_dimensions(r, "mandrill_512_q075.jpg");
@@ skipping 16 matching lines @@
     test_empty(r, "empty_images/zero-embedded.ico");
     test_empty(r, "empty_images/zero-width.bmp");
     test_empty(r, "empty_images/zero-height.bmp");
     test_empty(r, "empty_images/zero-width.jpg");
     test_empty(r, "empty_images/zero-height.jpg");
     test_empty(r, "empty_images/zero-width.png");
     test_empty(r, "empty_images/zero-height.png");
     test_empty(r, "empty_images/zero-width.wbmp");
     test_empty(r, "empty_images/zero-height.wbmp");
 }