Make SkImageGenerator::getPixels() return an enum.

tests/CachedDecodingPixelRefTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCachingPixelRef.h"
 #include "SkCanvas.h"
@@ skipping 171 matching lines @@
         REPORTER_ASSERT(fReporter, info);
         if ((NULL == info) || (kFailGetInfo_TestType == fType)) {
             return false;
         }
         *info = SkImageInfo::MakeN32(TestImageGenerator::Width(),
                                      TestImageGenerator::Height(),
                                      kOpaque_SkAlphaType);
         return true;
     }
 
-    virtual bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                             SkPMColor ctable[], int* ctableCount) SK_OVERRIDE {
+    virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                               SkPMColor ctable[], int* ctableCount) SK_OVERRIDE {
         REPORTER_ASSERT(fReporter, pixels != NULL);
-        size_t minRowBytes = static_cast<size_t>(info.width() * info.bytesPerPixel());
+        const size_t minRowBytes = info.minRowBytes();

[djsollen, 2015/02/12 14:22:15]

remove this and have >= info.minRowBytes on next line.

[scroggo, 2015/02/12 15:28:36]

I originally wrote that, but then I thought I saw minRowBytes somewhere
else.....

Done.

         REPORTER_ASSERT(fReporter, rowBytes >= minRowBytes);
-        if ((NULL == pixels)
-            || (fType != kSucceedGetPixels_TestType)
-            || (info.colorType() != kN32_SkColorType)) {
-            return false;
+        if (fType != kSucceedGetPixels_TestType) {
+            return kUnimplemented;
+        }
+        if (info.colorType() != kN32_SkColorType) {
+            return kInvalidConversion;
         }
         char* bytePtr = static_cast<char*>(pixels);
         for (int y = 0; y < info.height(); ++y) {
             sk_memset32(reinterpret_cast<SkColor*>(bytePtr),
                         TestImageGenerator::Color(), info.width());
             bytePtr += rowBytes;
         }
-        return true;
+        return kSuccess;
     }
 
 private:
     const TestType fType;
     skiatest::Reporter* const fReporter;
 };
 
 static void check_test_image_generator_bitmap(skiatest::Reporter* reporter,
                                               const SkBitmap& bm) {
     REPORTER_ASSERT(reporter, TestImageGenerator::Width() == bm.width());
@@ skipping 128 matching lines @@
         canvas.clear(kDefaultColor);
         canvas.drawImage(image, 0, 0, NULL);
         if (TestImageGenerator::kSucceedGetPixels_TestType == test) {
             REPORTER_ASSERT(
                     r, TestImageGenerator::Color() == *bitmap.getAddr32(0, 0));
         } else {
             REPORTER_ASSERT(r, kDefaultColor == bitmap.getColor(0,0));
         }
     }
 }