Expand pixelref to return SkImageInfo and rowbytes

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 "SkCanvas.h"
 #include "SkData.h"
@@ skipping 48 matching lines @@
 static bool simple_bitmap_factory(SkBitmapFactory::DecodeProc proc,
                                   SkData* data,
                                   SkBitmap* dst) {
     SkImageInfo info;
     if (!proc(data->data(), data->size(), &info, NULL)) {
         return false;
     }
     dst->setConfig(SkImageInfoToBitmapConfig(info), info.fWidth,
                     info.fHeight, 0, info.fAlphaType);
     SkAutoTUnref<SkLazyPixelRef> ref(SkNEW_ARGS(SkLazyPixelRef,
-                                                (data, proc, NULL)));
+                                                (info, data, proc, NULL)));
     dst->setPixelRef(ref);
     return true;
 }
 
 static void compare_bitmaps(skiatest::Reporter* reporter,
                             const SkBitmap& b1, const SkBitmap& b2,
                             bool pixelPerfect = true) {
     REPORTER_ASSERT(reporter, b1.empty() == b2.empty());
     REPORTER_ASSERT(reporter, b1.width() == b2.width());
     REPORTER_ASSERT(reporter, b1.height() == b2.height());
@@ skipping 118 matching lines @@
         SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
         REPORTER_ASSERT(reporter, NULL != lazy.getPixels());
     }
     compare_bitmaps(reporter, original, lazy, comparePixels);
 }
 DEF_TEST(LazyCachedPixelRef, reporter) {
     test_three_encodings(reporter, compare_with_skLazyCachedPixelRef);
 }
 
 class TestPixelRef : public SkCachingPixelRef {
+    static SkImageInfo cons_up_info() {
+        SkImageInfo info;
+        info.fWidth = 10;
+        info.fHeight = 10;
+        info.fColorType = kRGBA_8888_SkColorType;
+        info.fAlphaType = kOpaque_SkAlphaType;
+        return info;
+    }
 public:
-    TestPixelRef(int x) : fX(x) { }
+    TestPixelRef(int x)
+        : INHERITED(cons_up_info())
+        , fX(x) { }
     virtual ~TestPixelRef() { }
     static bool Install(SkBitmap* destination, int x) {
         SkAutoTUnref<TestPixelRef> ref(SkNEW_ARGS(TestPixelRef, (x)));
         return ref->configure(destination) && destination->setPixelRef(ref);
     }
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 protected:
-    virtual bool onDecodeInfo(SkImageInfo* info) SK_OVERRIDE {
-        if (fX == 0) {
-            return false;
-        }
-        SkASSERT(info);
-        info->fWidth = 10;
-        info->fHeight = 10;
-        info->fColorType = kRGBA_8888_SkColorType;
-        info->fAlphaType = kOpaque_SkAlphaType;
-        return true;
-    }
-    virtual bool onDecodePixels(const SkImageInfo& info,
-                                void* pixels,
+    virtual bool onDecodePixels(void* pixels,
                                 size_t rowBytes) SK_OVERRIDE {
-        return false;
+        return fX != 0;
     }
 private:
     int fX;  // controls where the failure happens
     typedef SkCachingPixelRef INHERITED;
 };
 
 DEF_TEST(CachingPixelRef, reporter) {
     SkBitmap lazy;
-    // test the error handling
-    REPORTER_ASSERT(reporter, !TestPixelRef::Install(&lazy, 0));
-    // onDecodeInfo should succeed, allowing installation
-    REPORTER_ASSERT(reporter, TestPixelRef::Install(&lazy, 1));
-    SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
-    // onDecodePixels should fail, so getting pixels will fail.
-    REPORTER_ASSERT(reporter, NULL == lazy.getPixels());
+    
+    {
+        REPORTER_ASSERT(reporter, TestPixelRef::Install(&lazy, 1));
+        SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
+        // onDecodePixels should succeed.
+        REPORTER_ASSERT(reporter, NULL != lazy.getPixels());
+    }
+    {
+        // onDecodeInfo should succeed, allowing installation
+        REPORTER_ASSERT(reporter, TestPixelRef::Install(&lazy, 0));
+        SkAutoLockPixels autoLockPixels(lazy);  // now pixels are bad.
+        // onDecodePixels should fail.
+        REPORTER_ASSERT(reporter, NULL == lazy.getPixels());
+    }
 }
 
 static void compare_with_SkDecodingImageGenerator(skiatest::Reporter* reporter,
                                                   SkData* encoded,
                                                   const SkBitmap& original,
                                                   bool comparePixels) {
 
     SkBitmap lazy;
     bool success = SkDecodingImageGenerator::Install(encoded, &lazy);
     REPORTER_ASSERT(reporter, success);
@@ skipping 13 matching lines @@
     REPORTER_ASSERT(reporter, NULL == lazy.getPixels());
     {
         SkAutoLockPixels autoLockPixels(lazy);  // now pixels are good.
         REPORTER_ASSERT(reporter, NULL != lazy.getPixels());
     }
     compare_bitmaps(reporter, original, lazy, comparePixels);
 }
 DEF_TEST(DecodingImageGenerator, reporter) {
     test_three_encodings(reporter, compare_with_SkDecodingImageGenerator);
 }