diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 21:21:46 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 21:21:46 +0000 |
| commit | dac522589e9395b4654a1a708f1bd971f37f95a5 (patch) | |
| tree | 3190dc309541bf8b706bee789b0a9ffce1771728 /gm/xfermodes.cpp | |
| parent | 5c056399259bb7ec06ff1eb8ce904001b363276c (diff) | |
replace SkBitmap::Config with SkColorType in gms
add helper installMaskPixels() to SkBitmap
BUG=skia:
R=halcanary@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/169913003
git-svn-id: http://skia.googlecode.com/svn/trunk@13482 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/xfermodes.cpp')
| -rw-r--r-- | gm/xfermodes.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index 353bebf56f..b5ce8b8ced 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -31,8 +31,7 @@ static void make_bitmaps(int w, int h, SkBitmap* src, SkBitmap* dst, c.drawOval(r, p); } - dst->setConfig(SkBitmap::kARGB_8888_Config, w, h); - dst->allocPixels(); + dst->allocN32Pixels(w, h); dst->eraseColor(SK_ColorTRANSPARENT); { @@ -42,8 +41,7 @@ static void make_bitmaps(int w, int h, SkBitmap* src, SkBitmap* dst, c.drawRect(r, p); } - transparent->setConfig(SkBitmap::kARGB_8888_Config, w, h); - transparent->allocPixels(); + transparent->allocN32Pixels(w, h); transparent->eraseColor(SK_ColorTRANSPARENT); } @@ -150,8 +148,9 @@ class XfermodesGM : public GM { } virtual void onOnceBeforeDraw() SK_OVERRIDE { - fBG.setConfig(SkBitmap::kARGB_4444_Config, 2, 2, 4, kOpaque_SkAlphaType); - fBG.setPixels(gData); + fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, + kOpaque_SkAlphaType), + gData, 4); make_bitmaps(W, H, &fSrcB, &fDstB, &fTransparent); } |