discardable pixelrefs are gone, update tests accordingly

tests/ImageDecodingTest.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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 343 matching lines @@
     0xff6fac98, 0xff941d27, 0xff5fe411, 0xfffbb283,
     0xffd86e99, 0xff169162, 0xff71128c, 0xff39cab4,
     0xffa7fe63, 0xff4c956b, 0xffbc22e0, 0xffb272e4,
     0xff129f4a, 0xffe34513, 0xff3d3742, 0xffbd190a,
     0xffb07222, 0xff2e23f8, 0xfff089d9, 0xffb35738,
     0xffa86022, 0xff3340fe, 0xff95fe71, 0xff6a71df
 };
 static_assert((kExpectedWidth * kExpectedHeight) == SK_ARRAY_COUNT(kExpectedPixels),
               "array_size_mismatch");
 
+static bool decode_into_bitmap(skiatest::Reporter* r, SkBitmap* bm, SkData* encoded) {
+    SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(encoded));
+    if (!gen) {
+        REPORTER_ASSERT(r, false);
+        return false;
+    }
+    if (!gen->tryGenerateBitmap(bm)) {
+        REPORTER_ASSERT(r, false);
+        return false;
+    }
+    return true;
+}
+
 DEF_TEST(WebP, reporter) {
     const unsigned char encodedWebP[] = {
         0x52, 0x49, 0x46, 0x46, 0x2c, 0x01, 0x00, 0x00, 0x57, 0x45, 0x42, 0x50,
         0x56, 0x50, 0x38, 0x4c, 0x20, 0x01, 0x00, 0x00, 0x2f, 0x07, 0xc0, 0x01,
         0x00, 0xff, 0x01, 0x45, 0x03, 0x00, 0xe2, 0xd5, 0xae, 0x60, 0x2b, 0xad,
         0xd9, 0x68, 0x76, 0xb6, 0x8d, 0x6a, 0x1d, 0xc0, 0xe6, 0x19, 0xd6, 0x16,
         0xb7, 0xb4, 0xef, 0xcf, 0xc3, 0x15, 0x6c, 0xb3, 0xbd, 0x77, 0x0d, 0x85,
         0x6d, 0x1b, 0xa9, 0xb1, 0x2b, 0xdc, 0x3d, 0x83, 0xdb, 0x00, 0x00, 0xc8,
         0x26, 0xe5, 0x01, 0x99, 0x8a, 0xd5, 0xdd, 0xfc, 0x82, 0xcd, 0xcd, 0x9a,
         0x8c, 0x13, 0xcc, 0x1b, 0xba, 0xf5, 0x05, 0xdb, 0xee, 0x6a, 0xdb, 0x38,
         0x60, 0xfe, 0x43, 0x2c, 0xd4, 0x6a, 0x99, 0x4d, 0xc6, 0xc0, 0xd3, 0x28,
         0x1b, 0xc1, 0xb1, 0x17, 0x4e, 0x43, 0x0e, 0x3d, 0x27, 0xe9, 0xe4, 0x84,
         0x4f, 0x24, 0x62, 0x69, 0x85, 0x43, 0x8d, 0xc2, 0x04, 0x00, 0x07, 0x59,
         0x60, 0xfd, 0x8b, 0x4d, 0x60, 0x32, 0x72, 0xcf, 0x88, 0x0c, 0x2f, 0x2f,
         0xad, 0x62, 0xbd, 0x27, 0x09, 0x16, 0x70, 0x78, 0x6c, 0xd9, 0x82, 0xef,
         0x1a, 0xa2, 0xcc, 0xf0, 0xf1, 0x6f, 0xd8, 0x78, 0x2e, 0x39, 0xa1, 0xcf,
         0x14, 0x4b, 0x89, 0xb4, 0x1b, 0x48, 0x15, 0x7c, 0x48, 0x6f, 0x8c, 0x20,
         0xb7, 0x00, 0xcf, 0xfc, 0xdb, 0xd0, 0xe9, 0xe7, 0x42, 0x09, 0xa4, 0x03,
         0x40, 0xac, 0xda, 0x40, 0x01, 0x00, 0x5f, 0xa1, 0x3d, 0x64, 0xe1, 0xf4,
         0x03, 0x45, 0x29, 0xe0, 0xe2, 0x4a, 0xc3, 0xa2, 0xe8, 0xe0, 0x25, 0x12,
         0x74, 0xc6, 0xe8, 0xfb, 0x93, 0x4f, 0x9f, 0x5e, 0xc0, 0xa6, 0x91, 0x1b,
         0xa4, 0x24, 0x82, 0xc3, 0x61, 0x07, 0x4c, 0x49, 0x4f, 0x53, 0xae, 0x5f,
         0x5d, 0x39, 0x36, 0xc0, 0x5b, 0x57, 0x54, 0x60, 0x10, 0x00, 0x00, 0xd1,
         0x68, 0xb6, 0x6d, 0xdb, 0x36, 0x22, 0xfa, 0x1f, 0x35, 0x75, 0x22, 0xec,
         0x31, 0xbc, 0x5d, 0x8f, 0x87, 0x53, 0xa2, 0x05, 0x8c, 0x2f, 0xcd, 0xa8,
         0xa7, 0xf3, 0xa3, 0xbd, 0x83, 0x8b, 0x2a, 0xc8, 0x58, 0xf5, 0xac, 0x80,
         0xe3, 0xfe, 0x66, 0xa4, 0x7c, 0x1b, 0x6c, 0xd1, 0xa9, 0xd8, 0x14, 0xd0,
         0xc5, 0xb5, 0x39, 0x71, 0x97, 0x19, 0x19, 0x1b
     };
-    SkAutoDataUnref encoded(SkData::NewWithCopy(encodedWebP,
-                                                sizeof(encodedWebP)));
+
     SkBitmap bm;
-
-    bool success = SkInstallDiscardablePixelRef(encoded, &bm);
-
-    REPORTER_ASSERT(reporter, success);
-    if (!success) {
+    SkAutoDataUnref encoded(SkData::NewWithoutCopy(encodedWebP, sizeof(encodedWebP)));
+    if (!decode_into_bitmap(reporter, &bm, encoded)) {
         return;
     }
-    SkAutoLockPixels alp(bm);
+    if (kExpectedWidth != bm.width() || kExpectedHeight != bm.height()) {
+        REPORTER_ASSERT(reporter, false);
+        return;
+    }
 
-    bool rightSize = ((kExpectedWidth == bm.width())
-                      && (kExpectedHeight == bm.height()));
-    REPORTER_ASSERT(reporter, rightSize);
-    if (rightSize) {
-        bool error = false;
-        const SkColor* correctPixel = kExpectedPixels;
-        for (int y = 0; y < bm.height(); ++y) {
-            for (int x = 0; x < bm.width(); ++x) {
-                error |= (*correctPixel != bm.getColor(x, y));
-                ++correctPixel;
-            }
+    bool error = false;
+    const SkColor* correctPixel = kExpectedPixels;
+    for (int y = 0; y < bm.height(); ++y) {
+        for (int x = 0; x < bm.width(); ++x) {
+            error |= (*correctPixel != bm.getColor(x, y));
+            ++correctPixel;
         }
-        REPORTER_ASSERT(reporter, !error);
+    }
+    REPORTER_ASSERT(reporter, !error);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ *  A test for the SkDecodingImageGenerator::Create
+ */
+DEF_TEST(ImprovedBitmapFactory, reporter) {
+    SkString pngFilename = GetResourcePath("randPixels.png");
+    SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(pngFilename.c_str()));
+    if (sk_exists(pngFilename.c_str())) {
+        // example of how Android will do this inside their BitmapFactory
+        SkDecodingImageGenerator::Options opts(1, true, kN32_SkColorType);
+        SkBitmap bm;
+        SkImageGenerator* gen = SkDecodingImageGenerator::Create(stream, opts);
+        REPORTER_ASSERT(reporter, gen->tryGenerateBitmap(&bm));
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// example of how Android will do this inside their BitmapFactory
-static SkPixelRef* install_pixel_ref(SkBitmap* bitmap,
-                                     SkStreamRewindable* stream,
-                                     int sampleSize, bool ditherImage) {
-    SkASSERT(bitmap != nullptr);
-    SkASSERT(stream != nullptr);
-    SkASSERT(stream->rewind());
-    SkColorType colorType = bitmap->colorType();
-    SkDecodingImageGenerator::Options opts(sampleSize, ditherImage, colorType);
-    if (SkInstallDiscardablePixelRef(
-                SkDecodingImageGenerator::Create(stream, opts), bitmap)) {
-        return bitmap->pixelRef();
-    }
-    return nullptr;
-}
-/**
- *  A test for the SkDecodingImageGenerator::Create and
- *  SkInstallDiscardablePixelRef functions.
- */
-DEF_TEST(ImprovedBitmapFactory, reporter) {
-    SkString pngFilename = GetResourcePath("randPixels.png");
-    SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(pngFilename.c_str()));
-    if (sk_exists(pngFilename.c_str())) {
-        SkBitmap bm;
-        SkAssertResult(bm.setInfo(SkImageInfo::MakeN32Premul(1, 1)));
-        REPORTER_ASSERT(reporter,
-            install_pixel_ref(&bm, stream.detach(), 1, true));
-        SkAutoLockPixels alp(bm);
-        REPORTER_ASSERT(reporter, bm.getPixels());
-    }
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-
 #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
 static inline bool check_rounding(int value, int dividend, int divisor) {
     // returns true if the value is greater than floor(dividend/divisor)
     // and less than SkNextPow2(ceil(dividend - divisor))
     return (((divisor * value) > (dividend - divisor))
             && value <= SkNextPow2(((dividend - 1) / divisor) + 1));
 }
 #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
 
 
@@ skipping 38 matching lines @@
  * Given either a SkStream or a SkData, try to decode the encoded
  * image using the specified options and report errors.
  */
 static void test_options(skiatest::Reporter* reporter,
                          const SkDecodingImageGenerator::Options& opts,
                          SkStreamRewindable* encodedStream,
                          SkData* encodedData,
                          bool useData,
                          const SkString& path) {
     SkBitmap bm;
-    bool success = false;
+    SkImageGenerator* gen;
+
     if (useData) {
         if (nullptr == encodedData) {
             return;
         }
-        success = SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(encodedData, opts), &bm);
+        gen = SkDecodingImageGenerator::Create(encodedData, opts);
     } else {
         if (nullptr == encodedStream) {
             return;
         }
-        success = SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts), &bm);
+        gen = SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts);
     }
-    if (!success) {
-        if (opts.fUseRequestedColorType
-            && (kARGB_4444_SkColorType == opts.fRequestedColorType)) {
+    if (!gen) {
+        if (opts.fUseRequestedColorType && (kARGB_4444_SkColorType == opts.fRequestedColorType)) {
             return;  // Ignore known conversion inabilities.
         }
         // If we get here, it's a failure and we will need more
         // information about why it failed.
         ERRORF(reporter, "Bounds decode failed [sampleSize=%d dither=%s "
                "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
                options_colorType(opts), path.c_str());
         return;
     }
+    if (!gen->tryGenerateBitmap(&bm)) {
+        return;
+    }
+
     #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
     // Android is the only system that use Skia's image decoders in
     // production.  For now, we'll only verify that samplesize works
     // on systems where it already is known to work.
-    REPORTER_ASSERT(reporter, check_rounding(bm.height(), kExpectedHeight,
-                                             opts.fSampleSize));
-    REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth,
-                                             opts.fSampleSize));
+    REPORTER_ASSERT(reporter, check_rounding(bm.height(), kExpectedHeight, opts.fSampleSize));
+    REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth, opts.fSampleSize));
     // The ImageDecoder API doesn't guarantee that SampleSize does
     // anything at all, but the decoders that this test excercises all
     // produce an output size in the following range:
     //    (((sample_size * out_size) > (in_size - sample_size))
     //     && out_size <= SkNextPow2(((in_size - 1) / sample_size) + 1));
     #endif  // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
-    SkAutoLockPixels alp(bm);
-    if (bm.getPixels() == nullptr) {
-        ERRORF(reporter, "Pixel decode failed [sampleSize=%d dither=%s "
-               "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
-               options_colorType(opts), path.c_str());
-        return;
-    }
 
     SkColorType requestedColorType = opts.fRequestedColorType;
     REPORTER_ASSERT(reporter,
                     (!opts.fUseRequestedColorType)
                     || (bm.colorType() == requestedColorType));
 
     // Condition under which we should check the decoding results:
     if ((kN32_SkColorType == bm.colorType())
         && (!path.endsWith(".jpg"))  // lossy
         && (opts.fSampleSize == 1)) {  // scaled
@@ skipping 81 matching lines @@
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }
 
-DEF_TEST(DiscardablePixelRef_SecondLockColorTableCheck, r) {
+DEF_TEST(DecodingImageGenerator_ColorTableCheck, r) {
     SkString resourceDir = GetResourcePath();
     SkString path = SkOSPath::Join(resourceDir.c_str(), "randPixels.gif");
     if (!sk_exists(path.c_str())) {
         return;
     }
     SkAutoDataUnref encoded(SkData::NewFromFileName(path.c_str()));
     SkBitmap bitmap;
-    if (!SkInstallDiscardablePixelRef(
-            SkDecodingImageGenerator::Create(
-                    encoded, SkDecodingImageGenerator::Options()), &bitmap)) {
-        #ifndef SK_BUILD_FOR_WIN
-        ERRORF(r, "SkInstallDiscardablePixelRef [randPixels.gif] failed.");
-        #endif
+    SkImageGenerator* gen = SkDecodingImageGenerator::Create(encoded,
+                                                             SkDecodingImageGenerator::Options());
+    if (!gen) {
+        REPORTER_ASSERT(r, false);
+        return;
+    }
+    if (!gen->tryGenerateBitmap(&bitmap)) {
+        REPORTER_ASSERT(r, false);
         return;
     }
     if (kIndex_8_SkColorType != bitmap.colorType()) {
         return;
     }
-    {
-        SkAutoLockPixels alp(bitmap);
-        REPORTER_ASSERT(r, bitmap.getColorTable() && "first pass");
-    }
-    {
-        SkAutoLockPixels alp(bitmap);
-        REPORTER_ASSERT(r, bitmap.getColorTable() && "second pass");
-    }
+    REPORTER_ASSERT(r, bitmap.getColorTable());
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 namespace {
 class SingleAllocator : public SkBitmap::Allocator {
 public:
     SingleAllocator(void* p, size_t s) : fPixels(p), fSize(s) { }
     ~SingleAllocator() {}
     // If the pixels in fPixels are big enough, use them.
@@ skipping 44 matching lines @@
             new SingleAllocator((void*)pixels.get(), sizeof(uint16_t) * pixelCount));
     decoder->setAllocator(allocator);
     decoder->setSampleSize(2);
     SkBitmap bitmap;
     bool success = decoder->decode(stream, &bitmap, kRGB_565_SkColorType,
                                    SkImageDecoder::kDecodePixels_Mode) != SkImageDecoder::kFailure;
     REPORTER_ASSERT(r, success);
     REPORTER_ASSERT(r, !allocator->ready());  // Decoder used correct memory
     REPORTER_ASSERT(r, sentinal == pixels[pixelCount]);
 }