diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-25 16:46:20 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-25 16:46:20 +0000 |
| commit | eb9a46cbbb475e862a084aa2224ec18d4ac5e95b (patch) | |
| tree | 3e0f1b499eb5567989e23ec5b43977d43f6e3200 /gm/downsamplebitmap.cpp | |
| parent | d2ac07b64b7d46e81d00d389781f9f83810f0095 (diff) | |
add legacy/helper allocN32Pixels, and convert gm to use it
This is an intermediate api, but might help us quickly get to a point where
no one is creating bitmaps in a 2-step process (setConfig + alloc).
BUG=skia:
R=halcanary@google.com
Review URL: https://codereview.chromium.org/140593005
git-svn-id: http://skia.googlecode.com/svn/trunk@13182 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/downsamplebitmap.cpp')
| -rw-r--r-- | gm/downsamplebitmap.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 034538c15c..4b97804b01 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -99,8 +99,7 @@ class DownsampleBitmapTextGM: public DownsampleBitmapGM { float fTextSize; virtual void make_bitmap() SK_OVERRIDE { - fBM.setConfig(SkBitmap::kARGB_8888_Config, int(fTextSize * 8), int(fTextSize * 6)); - fBM.allocPixels(); + fBM.allocN32Pixels(int(fTextSize * 8), int(fTextSize * 6)); SkCanvas canvas(fBM); canvas.drawColor(SK_ColorWHITE); @@ -135,9 +134,7 @@ class DownsampleBitmapCheckerboardGM: public DownsampleBitmapGM { int fNumChecks; virtual void make_bitmap() SK_OVERRIDE { - fBM.setConfig(SkBitmap::kARGB_8888_Config, fSize, fSize); - fBM.allocPixels(); - SkAutoLockPixels lock(fBM); + fBM.allocN32Pixels(fSize, fSize); for (int y = 0; y < fSize; ++y) { for (int x = 0; x < fSize; ++x) { SkPMColor* s = fBM.getAddr32(x, y); @@ -183,8 +180,7 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM { SkImageDecoder::kDecodePixels_Mode); SkDELETE(codec); } else { - fBM.setConfig(SkBitmap::kARGB_8888_Config, 1, 1); - fBM.allocPixels(); + fBM.allocN32Pixels(1, 1); *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad } fSize = fBM.height(); |