hide SkBitmap::setConfig

bench/GameBench.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 230 matching lines @@
     SkScalar fSaved[kNumBeforeClear][3];
 
     SkBitmap fCheckerboard;
     SkBitmap fAtlas;
     SkIRect  fAtlasRects[kNumAtlasedX][kNumAtlasedY];
 
     // Note: the resulting checker board has transparency
     void makeCheckerboard() {
         static int kCheckSize = 16;
 
-        fCheckerboard.setConfig(SkBitmap::kARGB_8888_Config,
-                                kCheckerboardWidth, kCheckerboardHeight);
-        fCheckerboard.allocPixels();
+        fCheckerboard.allocN32Pixels(kCheckerboardWidth, kCheckerboardHeight);
         SkAutoLockPixels lock(fCheckerboard);
         for (int y = 0; y < kCheckerboardHeight; ++y) {
             int even = (y / kCheckSize) % 2;
 
             SkPMColor* scanline = fCheckerboard.getAddr32(0, y);
 
             for (int x = 0; x < kCheckerboardWidth; ++x) {
                 if (even == (x / kCheckSize) % 2) {
                     *scanline++ = 0xFFFF0000;
                 } else {
@@ skipping 12 matching lines @@
         for (int y = 0; y < kNumAtlasedY; ++y) {
             for (int x = 0; x < kNumAtlasedX; ++x) {
                 colors[x][y] = rand.nextU() | 0xff000000;
                 fAtlasRects[x][y] = SkIRect::MakeXYWH(kAtlasSpacer + x * (kAtlasCellWidth + kAtlasSpacer),
                                                       kAtlasSpacer + y * (kAtlasCellHeight + kAtlasSpacer),
                                                       kAtlasCellWidth,
                                                       kAtlasCellHeight);
             }
         }
 
-        fAtlas.setConfig(SkBitmap::kARGB_8888_Config, kTotAtlasWidth, kTotAtlasHeight);
-        fAtlas.allocPixels();
+        fAtlas.allocN32Pixels(kTotAtlasWidth, kTotAtlasHeight);
         SkAutoLockPixels lock(fAtlas);
 
         for (int y = 0; y < kTotAtlasHeight; ++y) {
             int colorY = y / (kAtlasCellHeight + kAtlasSpacer);
             bool inColorY = (y % (kAtlasCellHeight + kAtlasSpacer)) >= kAtlasSpacer;
 
             SkPMColor* scanline = fAtlas.getAddr32(0, y);
 
             for (int x = 0; x < kTotAtlasWidth; ++x, ++scanline) {
                 int colorX = x / (kAtlasCellWidth + kAtlasSpacer);
@@ skipping 30 matching lines @@
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type,
                                             GameBench::kFull_Clear)); )
 
 // Atlased
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true, true)); )