AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update comment on setShader to clarify alpha-bitmap behavior in bitmapshaders

Browse Source 
BUG=skia:2293
R=bsalomon@google.com, yunchao.he@intel.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/203203005

git-svn-id: http://skia.googlecode.com/svn/trunk@13851 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-03-18 16:28:12 +00:00
parent 14bdd527ee
commit e5957f67d0
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gm/bitmapshader.cpp
View File

@ -35,6 +35,11 @@ static void draw_mask(SkBitmap* bm) {
canvas.drawCircle(10, 10, 10, circlePaint); canvas.drawCircle(10, 10, 10, circlePaint);
} }
static void adopt_shader(SkPaint* paint, SkShader* shader) {
paint->setShader(shader);
SkSafeUnref(shader);
}
class BitmapShaderGM : public GM { class BitmapShaderGM : public GM {
public: public:
@ -50,17 +55,14 @@ protected:
} }
virtual SkISize onISize() { virtual SkISize onISize() {
return make_isize(75, 100); return SkISize::Make(75, 100);
} }
virtual void onDraw(SkCanvas* canvas) { virtual void onDraw(SkCanvas* canvas) {
SkShader* shader = SkShader::CreateBitmapShader(fBitmap,
SkShader::kClamp_TileMode,
SkShader::kClamp_TileMode);
SkPaint paint; SkPaint paint;
paint.setShader(shader);
// release the shader ref as the paint now holds a reference adopt_shader(&paint, SkShader::CreateBitmapShader(fBitmap, SkShader::kClamp_TileMode,
shader->unref(); SkShader::kClamp_TileMode));
// draw the shader with a bitmap mask // draw the shader with a bitmap mask
canvas->drawBitmap(fMask, 0, 0, &paint); canvas->drawBitmap(fMask, 0, 0, &paint);
@ -68,18 +70,14 @@ protected:
canvas->translate(0, 25); canvas->translate(0, 25);
// draw the shader with standard geometry
canvas->drawCircle(10, 10, 10, paint); canvas->drawCircle(10, 10, 10, paint);
canvas->drawCircle(40, 10, 10, paint); // no blue circle expected canvas->drawCircle(40, 10, 10, paint); // no blue circle expected
canvas->translate(0, 25); canvas->translate(0, 25);
shader = SkShader::CreateBitmapShader(fMask, adopt_shader(&paint, SkShader::CreateBitmapShader(fMask, SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode));
SkShader::kRepeat_TileMode);
paint.setShader(shader);
paint.setColor(SK_ColorRED); paint.setColor(SK_ColorRED);
shader->unref();
// draw the mask using the shader and a color // draw the mask using the shader and a color
canvas->drawRect(SkRect::MakeXYWH(0, 0, 20, 20), paint); canvas->drawRect(SkRect::MakeXYWH(0, 0, 20, 20), paint);

7
include/core/SkPaint.h
View File

@ -514,7 +514,12 @@ public:
* once (e.g. bitmap tiling or gradient) and then change its transparency * once (e.g. bitmap tiling or gradient) and then change its transparency
* w/o having to modify the original shader... only the paint's alpha needs * w/o having to modify the original shader... only the paint's alpha needs
* to be modified. * to be modified.
* <p /> *
* There is an exception to this only-respect-paint's-alpha rule: If the shader only generates
* alpha (e.g. SkShader::CreateBitmapShader(bitmap, ...) where bitmap's colortype is kAlpha_8)
* then the shader will use the paint's entire color to "colorize" its output (modulating the
* bitmap's alpha with the paint's color+alpha).
*
* Pass NULL to clear any previous shader. * Pass NULL to clear any previous shader.
* As a convenience, the parameter passed is also returned. * As a convenience, the parameter passed is also returned.
* If a previous shader exists, its reference count is decremented. * If a previous shader exists, its reference count is decremented.