hide SkBitmap::setConfig

bench/MergeBench.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 "SkBenchmark.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
@@ skipping 34 matching lines @@
 private:
     SkImageFilter* mergeBitmaps() {
         SkImageFilter* first = SkBitmapSource::Create(fCheckerboard);
         SkImageFilter* second = SkBitmapSource::Create(fBitmap);
         SkAutoUnref aur0(first);
         SkAutoUnref aur1(second);
         return SkMergeImageFilter::Create(first, second);
     }
 
     void make_bitmap() {
-        fBitmap.setConfig(SkBitmap::kARGB_8888_Config, 80, 80);
-        fBitmap.allocPixels();
-        SkBitmapDevice device(fBitmap);
-        SkCanvas canvas(&device);
+        fBitmap.allocN32Pixels(80, 80);
+        SkCanvas canvas(fBitmap);
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setColor(0xFF884422);
         paint.setTextSize(SkIntToScalar(96));
         const char* str = "g";
         canvas.drawText(str, strlen(str), SkIntToScalar(15), SkIntToScalar(55), paint);
     }
 
     void make_checkerboard() {
-        fCheckerboard.setConfig(SkBitmap::kARGB_8888_Config, 80, 80);
-        fCheckerboard.allocPixels();
-        SkBitmapDevice device(fCheckerboard);
-        SkCanvas canvas(&device);
+        fCheckerboard.allocN32Pixels(80, 80);
+        SkCanvas canvas(fCheckerboard);
         canvas.clear(0x00000000);
         SkPaint darkPaint;
         darkPaint.setColor(0xFF804020);
         SkPaint lightPaint;
         lightPaint.setColor(0xFF244484);
         for (int y = 0; y < 80; y += 16) {
             for (int x = 0; x < 80; x += 16) {
                 canvas.save();
                 canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
                 canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
                 canvas.restore();
             }
         }
     }
 
     bool fIsSmall;
     bool fInitialized;
     SkBitmap fBitmap, fCheckerboard;
 
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new MergeBench(true); )
 DEF_BENCH( return new MergeBench(false); )