add legacy/helper allocN32Pixels, and convert gm to use it

gm/bitmaprect.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 
 static void make_bitmap(SkBitmap* bitmap) {
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
-    bitmap->allocPixels();
+    bitmap->allocN32Pixels(64, 64);
 
     SkCanvas canvas(*bitmap);
 
     canvas.drawColor(SK_ColorRED);
     SkPaint paint;
     paint.setAntiAlias(true);
     const SkPoint pts[] = { { 0, 0 }, { 64, 64 } };
     const SkColor colors[] = { SK_ColorWHITE, SK_ColorBLUE };
     paint.setShader(SkGradientShader::CreateLinear(pts, colors, NULL, 2,
                                                    SkShader::kClamp_TileMode))->unref();
@@ skipping 64 matching lines @@
     static const int gXSize = 3;
     static const int gYSize = 3;
 
     SkColor textureData[gXSize][gYSize] = {
         { SK_ColorRED,    SK_ColorWHITE, SK_ColorBLUE },
         { SK_ColorGREEN,  SK_ColorBLACK, SK_ColorCYAN },
         { SK_ColorYELLOW, SK_ColorGRAY,  SK_ColorMAGENTA }
     };
 
 
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config, gXSize, gYSize);
-    bitmap->allocPixels();
-
-    SkAutoLockPixels lock(*bitmap);
+    bitmap->allocN32Pixels(gXSize, gYSize);
     for (int y = 0; y < gYSize; y++) {
         for (int x = 0; x < gXSize; x++) {
             *bitmap->getAddr32(x, y) = textureData[x][y];
         }
     }
 }
 
 // This GM attempts to make visible any issues drawBitmapRectToRect may have
 // with partial source rects. In this case the eight pixels on the border
 // should be half the width/height of the central pixel, i.e.:
@@ skipping 33 matching lines @@
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 static void make_big_bitmap(SkBitmap* bitmap) {
 
     static const int gXSize = 4096;
     static const int gYSize = 4096;
     static const int gBorderWidth = 10;
 
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config, gXSize, gYSize);
-    bitmap->allocPixels();
-
-    SkAutoLockPixels lock(*bitmap);
+    bitmap->allocN32Pixels(gXSize, gYSize);
     for (int y = 0; y < gYSize; ++y) {
         for (int x = 0; x < gXSize; ++x) {
             if (x <= gBorderWidth || x >= gXSize-gBorderWidth ||
                 y <= gBorderWidth || y >= gYSize-gBorderWidth) {
                 *bitmap->getAddr32(x, y) = 0x88FFFFFF;
             } else {
                 *bitmap->getAddr32(x, y) = 0x88FF0000;
             }
         }
     }
@@ skipping 70 matching lines @@
 
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif