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/xfermodes2.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/xfermodes2.cpp')
| -rw-r--r-- | gm/xfermodes2.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 046c3ddc2a..6202af9a72 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -93,9 +93,7 @@ private: 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, @@ -106,9 +104,7 @@ private: 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) { @@ -122,9 +118,7 @@ private: 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) { |