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

gm/xfermodes2.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 "SkShader.h"
@@ skipping 75 matching lines @@
 
 private:
     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();
-        SkAutoLockPixels bgAlp(bg);
+        bg.allocN32Pixels(2, 2, true);
         memcpy(bg.getPixels(), kCheckData, sizeof(kCheckData));
 
         fBG.reset(SkShader::CreateBitmapShader(bg,
                                                SkShader::kRepeat_TileMode,
                                                SkShader::kRepeat_TileMode));
         SkMatrix lm;
         lm.setScale(SkIntToScalar(16), SkIntToScalar(16));
         fBG->setLocalMatrix(lm);
 
         SkBitmap dstBmp;
-        dstBmp.setConfig(SkBitmap::kARGB_8888_Config, kSize, kSize);
-        dstBmp.allocPixels();
-        SkAutoLockPixels dstAlp(dstBmp);
+        dstBmp.allocN32Pixels(kSize, kSize);
         SkPMColor* pixels = reinterpret_cast<SkPMColor*>(dstBmp.getPixels());
 
         for (int y = 0; y < kSize; ++y) {
             int c = y * (1 << kShift);
             SkPMColor rowColor = SkPackARGB32(c, c, 0, c/2);
             for (int x = 0; x < kSize; ++x) {
                 pixels[kSize * y + x] = rowColor;
             }
         }
         fSrc.reset(SkShader::CreateBitmapShader(dstBmp,
                                                 SkShader::kClamp_TileMode,
                                                 SkShader::kClamp_TileMode));
         SkBitmap srcBmp;
-        srcBmp.setConfig(SkBitmap::kARGB_8888_Config, kSize, kSize);
-        srcBmp.allocPixels();
-        SkAutoLockPixels srcAlp(srcBmp);
+        srcBmp.allocN32Pixels(kSize, kSize);
         pixels = reinterpret_cast<SkPMColor*>(srcBmp.getPixels());
 
         for (int x = 0; x < kSize; ++x) {
             int c = x * (1 << kShift);
             SkPMColor colColor = SkPackARGB32(c, 0, c, c/2);
             for (int y = 0; y < kSize; ++y) {
                 pixels[kSize * y + x] = colColor;
             }
         }
         fDst.reset(SkShader::CreateBitmapShader(srcBmp,
@@ skipping 12 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new Xfermodes2GM; }
 static GMRegistry reg(MyFactory);
 
 }