diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-16 22:03:38 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-16 22:03:38 +0000 |
| commit | e24ad23ae67ffcb0dc545b7e426cf08d102e0868 (patch) | |
| tree | 2ccf342de1ec310c1537c2f9a23c83645f1f8443 /src/effects/SkBlurMaskFilter.cpp | |
| parent | 6e58cf36f0eba4b195726aa714d5487c91d06d04 (diff) | |
use SkColorType instead of SkBitmap::Config in views/effects
R=scroggo@google.com, reed@google.com
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/168843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13469 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkBlurMaskFilter.cpp')
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 21731c4a31..f4d399b80f 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -195,10 +195,9 @@ static bool draw_rrect_into_mask(const SkRRect rrect, SkMask* mask) { // FIXME: This code duplicates code in draw_rects_into_mask, below. Is there a // clean way to share more code? SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kA8_Config, - mask->fBounds.width(), mask->fBounds.height(), - mask->fRowBytes); - bitmap.setPixels(mask->fImage); + bitmap.installPixels(SkImageInfo::MakeA8(mask->fBounds.width(), + mask->fBounds.height()), + mask->fImage, mask->fRowBytes, NULL, NULL); SkCanvas canvas(bitmap); canvas.translate(-SkIntToScalar(mask->fBounds.left()), @@ -216,10 +215,11 @@ static bool draw_rects_into_mask(const SkRect rects[], int count, SkMask* mask) } SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kA8_Config, - mask->fBounds.width(), mask->fBounds.height(), - mask->fRowBytes); - bitmap.setPixels(mask->fImage); + bitmap.installPixels(SkImageInfo::Make(mask->fBounds.width(), + mask->fBounds.height(), + kAlpha_8_SkColorType, + kPremul_SkAlphaType), + mask->fImage, mask->fRowBytes, NULL, NULL); SkCanvas canvas(bitmap); canvas.translate(-SkIntToScalar(mask->fBounds.left()), |