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

gm/xfermodes3.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 "gm.h"
 #include "SkBitmap.h"
 #include "SkGradientShader.h"
@@ skipping 170 matching lines @@
     }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
         static const uint32_t kCheckData[] = {
             SkPackARGB32(0xFF, 0x40, 0x40, 0x40),
             SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0),
             SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0),
             SkPackARGB32(0xFF, 0x40, 0x40, 0x40)
         };
         SkBitmap bg;
-        bg.setConfig(SkBitmap::kARGB_8888_Config, 2, 2, 0, kOpaque_SkAlphaType);
-        bg.allocPixels();
+        bg.allocN32Pixels(2, 2, true);
         SkAutoLockPixels bgAlp(bg);
         memcpy(bg.getPixels(), kCheckData, sizeof(kCheckData));
 
         fBGShader.reset(SkShader::CreateBitmapShader(bg,
                                                      SkShader::kRepeat_TileMode,
                                                      SkShader::kRepeat_TileMode));
         SkMatrix lm;
         lm.setScale(SkIntToScalar(kCheckSize), SkIntToScalar(kCheckSize));
         fBGShader->setLocalMatrix(lm);
 
         SkPaint bmpPaint;
         static const SkPoint kCenter = { SkIntToScalar(kSize) / 2, SkIntToScalar(kSize) / 2 };
         static const SkColor kColors[] = { SK_ColorTRANSPARENT, 0x80800000,
                                           0xF020F060, SK_ColorWHITE };
         bmpPaint.setShader(SkGradientShader::CreateRadial(kCenter,
                                                           3 * SkIntToScalar(kSize) / 4,
                                                           kColors,
                                                           NULL,
                                                           SK_ARRAY_COUNT(kColors),
                                                           SkShader::kRepeat_TileMode))->unref();
 
         SkBitmap bmp;
-        bmp.setConfig(SkBitmap::kARGB_8888_Config, kSize, kSize);
-        bmp.allocPixels();
+        bmp.allocN32Pixels(kSize, kSize);
         SkCanvas bmpCanvas(bmp);
 
         bmpCanvas.clear(SK_ColorTRANSPARENT);
         SkRect rect = { SkIntToScalar(kSize) / 8, SkIntToScalar(kSize) / 8,
                         7 * SkIntToScalar(kSize) / 8, 7 * SkIntToScalar(kSize) / 8};
         bmpCanvas.drawRect(rect, bmpPaint);
 
         fBmpShader.reset(SkShader::CreateBitmapShader(bmp,
                                                       SkShader::kClamp_TileMode,
                                                       SkShader::kClamp_TileMode));
     }
 
     enum {
         kCheckSize = 8,
         kSize = 30,
         kTestsPerRow = 15,
     };
 
     SkAutoTUnref<SkShader> fBGShader;
     SkAutoTUnref<SkShader> fBmpShader;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new Xfermodes3GM;)
 
 }