Make SkImageGenerator::getPixels() return an enum.

src/ports/SkImageGenerator_skia.cpp

Index: src/ports/SkImageGenerator_skia.cpp
diff --git a/src/ports/SkImageGenerator_skia.cpp b/src/ports/SkImageGenerator_skia.cpp
index 878a44de9c7e18cc81958a2c7e24cb8600b43acc..6c27f45a56171605bebfcf66e27d6b9cfeb7ef85 100644
--- a/src/ports/SkImageGenerator_skia.cpp
+++ b/src/ports/SkImageGenerator_skia.cpp
@@ -52,8 +52,8 @@ protected:
         return true;
     }
 
-    virtual bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                             SkPMColor ctableEntries[], int* ctableCount) SK_OVERRIDE {
+    virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                               SkPMColor ctableEntries[], int* ctableCount) SK_OVERRIDE {
         SkMemoryStream stream(fData->data(), fData->size(), false);
         SkAutoTUnref<BareMemoryAllocator> allocator(SkNEW_ARGS(BareMemoryAllocator,
                                                                (info, pixels, rowBytes)));
@@ -61,13 +61,10 @@ protected:
         fDecoder->setRequireUnpremultipliedColors(kUnpremul_SkAlphaType == info.alphaType());
 
         SkBitmap bm;
-        SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, info.colorType(),
-                                                         SkImageDecoder::kDecodePixels_Mode);
-        switch (result) {
-            case SkImageDecoder::kSuccess:
-                break;
-            default:
-                return false;
+        const SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, info.colorType(),
+                                                               SkImageDecoder::kDecodePixels_Mode);
+        if (SkImageDecoder::kFailure == result) {

[scroggo, 2015/02/11 16:01:25]

This is a change in behavior, to match DecodingImageGenerator. (Treat partial
success as success.)

+            return kInvalidInput;
         }
 
         SkASSERT(info.colorType() == bm.info().colorType());
@@ -77,13 +74,16 @@ protected:
 
             SkColorTable* ctable = bm.getColorTable();
             if (NULL == ctable) {
-                return false;

[scroggo, 2015/02/11 16:01:25]

This code sure looks like it was copied from DecodingImageGenerator. It also
seems like it should be an assert.

+                return kInvalidConversion;
             }
             const int count = ctable->count();
             memcpy(ctableEntries, ctable->readColors(), count * sizeof(SkPMColor));
             *ctableCount = count;
         }
-        return true;
+        if (SkImageDecoder::kPartialSuccess == result) {
+            return kIncompleteInput;
+        }
+        return kSuccess;
     }
 
     bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],