diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-07 07:02:21 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-07 07:02:21 +0000 |
commit | 56710d1905e2575ea91da400f0dd6b3fc6c346c3 (patch) | |
tree | cc2ff98a0d08b4abbfd3096d8ad43ab0ec86f07d /gm/bitmapshader.cpp | |
parent | 3e7f385336940f41553d87d93d24154cdf7247a6 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12555 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/bitmapshader.cpp')
-rw-r--r-- | gm/bitmapshader.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp index 4ec234898c..4fd68ee77f 100644 --- a/gm/bitmapshader.cpp +++ b/gm/bitmapshader.cpp @@ -14,27 +14,27 @@ namespace skiagm { static void draw_bm(SkBitmap* bm) { - SkPaint bluePaint; - bluePaint.setColor(SK_ColorBLUE); + SkPaint bluePaint; + bluePaint.setColor(SK_ColorBLUE); - bm->setConfig(SkBitmap::kARGB_8888_Config, 20, 20); - bm->allocPixels(); - bm->eraseColor(SK_ColorRED); + bm->setConfig(SkBitmap::kARGB_8888_Config, 20, 20); + bm->allocPixels(); + bm->eraseColor(SK_ColorRED); - SkCanvas canvas(*bm); - canvas.drawCircle(10, 10, 5, bluePaint); + SkCanvas canvas(*bm); + canvas.drawCircle(10, 10, 5, bluePaint); } static void draw_mask(SkBitmap* bm) { - SkPaint circlePaint; - circlePaint.setColor(SK_ColorBLACK); + SkPaint circlePaint; + circlePaint.setColor(SK_ColorBLACK); - bm->setConfig(SkBitmap::kA8_Config, 20, 20); - bm->allocPixels(); - bm->eraseColor(SK_ColorTRANSPARENT); + bm->setConfig(SkBitmap::kA8_Config, 20, 20); + bm->allocPixels(); + bm->eraseColor(SK_ColorTRANSPARENT); - SkCanvas canvas(*bm); - canvas.drawCircle(10, 10, 10, circlePaint); + SkCanvas canvas(*bm); + canvas.drawCircle(10, 10, 10, circlePaint); } class BitmapShaderGM : public GM { @@ -56,36 +56,36 @@ protected: } virtual void onDraw(SkCanvas* canvas) { - SkShader* shader = SkShader::CreateBitmapShader(fBitmap, - SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - SkPaint paint; - paint.setShader(shader); - // release the shader ref as the paint now holds a reference - shader->unref(); - - // draw the shader with a bitmap mask - canvas->drawBitmap(fMask, 0, 0, &paint); - canvas->drawBitmap(fMask, 30, 0, &paint); - - canvas->translate(0, 25); - - // draw the shader with standard geometry - canvas->drawCircle(10, 10, 10, paint); - canvas->drawCircle(40, 10, 10, paint); // no blue circle expected - - canvas->translate(0, 25); - - shader = SkShader::CreateBitmapShader(fMask, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - paint.setShader(shader); - paint.setColor(SK_ColorRED); - shader->unref(); - - // draw the mask using the shader and a color - canvas->drawRect(SkRect::MakeXYWH(0, 0, 20, 20), paint); - canvas->drawRect(SkRect::MakeXYWH(30, 0, 20, 20), paint); + SkShader* shader = SkShader::CreateBitmapShader(fBitmap, + SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode); + SkPaint paint; + paint.setShader(shader); + // release the shader ref as the paint now holds a reference + shader->unref(); + + // draw the shader with a bitmap mask + canvas->drawBitmap(fMask, 0, 0, &paint); + canvas->drawBitmap(fMask, 30, 0, &paint); + + canvas->translate(0, 25); + + // draw the shader with standard geometry + canvas->drawCircle(10, 10, 10, paint); + canvas->drawCircle(40, 10, 10, paint); // no blue circle expected + + canvas->translate(0, 25); + + shader = SkShader::CreateBitmapShader(fMask, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode); + paint.setShader(shader); + paint.setColor(SK_ColorRED); + shader->unref(); + + // draw the mask using the shader and a color + canvas->drawRect(SkRect::MakeXYWH(0, 0, 20, 20), paint); + canvas->drawRect(SkRect::MakeXYWH(30, 0, 20, 20), paint); } private: |