Add image->bitmap

tests/SurfaceTest.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 "SkCanvas.h"
 #include "SkData.h"
 #include "SkDevice.h"
@@ skipping 389 matching lines @@
     REPORTER_ASSERT(reporter, has_pixels(pixels, w*h - 1, notExpected));
 
     // partial bottom-right should succeed
     set_pixels(pixels, w*h, notExpected);
     REPORTER_ASSERT(reporter, image->readPixels(info, pixels, rowBytes,
                                                 image->width() - 1, image->height() - 1));
     REPORTER_ASSERT(reporter, pixels[0] == expected);
     REPORTER_ASSERT(reporter, has_pixels(&pixels[1], w*h - 1, notExpected));
 }
 
+static void test_legacy_bitmap(skiatest::Reporter* reporter, const SkImage* image) {
+    const SkImage::LegacyBitmapMode modes[] = {
+        SkImage::kRO_LegacyBitmapMode,
+        SkImage::kRW_LegacyBitmapMode,
+    };
+    for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) {
+        SkBitmap bitmap;
+        REPORTER_ASSERT(reporter, image->asLegacyBitmap(&bitmap, modes[i]));
+
+        REPORTER_ASSERT(reporter, image->width() == bitmap.width());
+        REPORTER_ASSERT(reporter, image->height() == bitmap.height());
+        REPORTER_ASSERT(reporter, image->isOpaque() == bitmap.isOpaque());
+
+        bitmap.lockPixels();
+        REPORTER_ASSERT(reporter, bitmap.getPixels());
+
+        const SkImageInfo info = SkImageInfo::MakeN32(1, 1, bitmap.alphaType());
+        SkPMColor imageColor;
+        REPORTER_ASSERT(reporter, image->readPixels(info, &imageColor, sizeof(SkPMColor), 0, 0));
+        REPORTER_ASSERT(reporter, imageColor == *bitmap.getAddr32(0, 0));
+
+        if (SkImage::kRO_LegacyBitmapMode == modes[i]) {
+            REPORTER_ASSERT(reporter, bitmap.isImmutable());
+        }
+    }
+}
+
 static void test_imagepeek(skiatest::Reporter* reporter, GrContextFactory* factory) {
     static const struct {
         ImageType   fType;
         bool        fPeekShouldSucceed;
         const char* fName;
     } gRec[] = {
         { kRasterCopy_ImageType,    true,       "RasterCopy"    },
         { kRasterData_ImageType,    true,       "RasterData"    },
         { kRasterProc_ImageType,    true,       "RasterProc"    },
         { kGpu_ImageType,           false,      "Gpu"           },
@@ skipping 23 matching lines @@
         if (!image.get()) {
             SkDebugf("failed to createImage[%d] %s\n", i, gRec[i].fName);
             continue;   // gpu may not be enabled
         }
         if (kRasterProc_ImageType == gRec[i].fType) {
             REPORTER_ASSERT(reporter, NULL != releaseCtx.fData);  // we are tracking the data
         } else {
             REPORTER_ASSERT(reporter, NULL == releaseCtx.fData);  // we ignored the context
         }
 
+        test_legacy_bitmap(reporter, image);
+
         const void* addr = image->peekPixels(&info, &rowBytes);
         bool success = SkToBool(addr);
         REPORTER_ASSERT(reporter, gRec[i].fPeekShouldSucceed == success);
         if (success) {
             REPORTER_ASSERT(reporter, 10 == info.width());
             REPORTER_ASSERT(reporter, 10 == info.height());
             REPORTER_ASSERT(reporter, kN32_SkColorType == info.colorType());
             REPORTER_ASSERT(reporter, kPremul_SkAlphaType == info.alphaType() ||
                             kOpaque_SkAlphaType == info.alphaType());
             REPORTER_ASSERT(reporter, info.minRowBytes() <= rowBytes);
@@ skipping 516 matching lines @@
     // We expect the ref'd image to see the new color, but cpy'd one should still see the old color
     test_image_color(reporter, refImg, expected1);
     test_image_color(reporter, cpyImg, expected0);
 
     // Now exercise the release proc
     REPORTER_ASSERT(reporter, !releaseCtx.fIsReleased);
     refImg.reset(NULL); // force a release of the image
     REPORTER_ASSERT(reporter, releaseCtx.fIsReleased);
 }
 #endif