add new readPixels with direct memory parameters

tests/PremulAlphaRoundTripTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkConfig8888.h"
@@ skipping 21 matching lines @@
     byte[0] = SkColorGetB(c);
     byte[1] = SkColorGetG(c);
     byte[2] = SkColorGetR(c);
     byte[3] = SkColorGetA(c);
     return packed;
 }
 
 typedef uint32_t (*PackUnpremulProc)(SkColor);
 
 const struct {
-    SkColorType             fColorType;
-    PackUnpremulProc        fPackProc;
-    SkCanvas::Config8888    fConfig8888;
+    SkColorType         fColorType;
+    PackUnpremulProc    fPackProc;
 } gUnpremul[] = {
-    { kRGBA_8888_SkColorType, pack_unpremul_rgba, SkCanvas::kRGBA_Unpremul_Config8888 },
-    { kBGRA_8888_SkColorType, pack_unpremul_bgra, SkCanvas::kBGRA_Unpremul_Config8888 },
+    { kRGBA_8888_SkColorType, pack_unpremul_rgba },
+    { kBGRA_8888_SkColorType, pack_unpremul_bgra },
 };
 
 static void fillCanvas(SkCanvas* canvas, SkColorType colorType, PackUnpremulProc proc) {
     // Don't strictly need a bitmap, but its a handy way to allocate the pixels
     SkBitmap bmp;
     bmp.allocN32Pixels(256, 256);
 
     for (int a = 0; a < 256; ++a) {
         uint32_t* pixels = bmp.getAddr32(0, a);
         for (int r = 0; r < 256; ++r) {
@@ skipping 34 matching lines @@
                     continue;
                 }
 
                 device.reset(SkGpuDevice::Create(context, info, 0));
 #else
                 continue;
 #endif
             }
             SkCanvas canvas(device);
 
-            SkBitmap readBmp1;
-            readBmp1.allocN32Pixels(256, 256);
-            SkBitmap readBmp2;
-            readBmp2.allocN32Pixels(256, 256);
-
             for (size_t upmaIdx = 0; upmaIdx < SK_ARRAY_COUNT(gUnpremul); ++upmaIdx) {
                 fillCanvas(&canvas, gUnpremul[upmaIdx].fColorType, gUnpremul[upmaIdx].fPackProc);
 
+                const SkImageInfo info = SkImageInfo::Make(256, 256, gUnpremul[upmaIdx].fColorType,
+                                                           kUnpremul_SkAlphaType);
+                SkBitmap readBmp1;
+                readBmp1.allocPixels(info);
+                SkBitmap readBmp2;
+                readBmp2.allocPixels(info);
+
                 readBmp1.eraseColor(0);
                 readBmp2.eraseColor(0);
 
-                canvas.readPixels(&readBmp1, 0, 0, gUnpremul[upmaIdx].fConfig8888);
+                canvas.readPixels(&readBmp1, 0, 0);
                 sk_tool_utils::write_pixels(&canvas, readBmp1, 0, 0, gUnpremul[upmaIdx].fColorType,
                                             kUnpremul_SkAlphaType);
-                canvas.readPixels(&readBmp2, 0, 0, gUnpremul[upmaIdx].fConfig8888);
+                canvas.readPixels(&readBmp2, 0, 0);
 
                 bool success = true;
                 for (int y = 0; y < 256 && success; ++y) {
                     const uint32_t* pixels1 = readBmp1.getAddr32(0, y);
                     const uint32_t* pixels2 = readBmp2.getAddr32(0, y);
                     for (int x = 0; x < 256 && success; ++x) {
                         REPORTER_ASSERT(reporter, success = pixels1[x] == pixels2[x]);
                     }
                 }
             }
         }
     }
 }