diff options
author | reed <reed@google.com> | 2016-03-09 09:50:50 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 09:50:50 -0800 |
commit | 2ad1aa67c6894696cdd65ec56057f81031d1c24a (patch) | |
tree | 867b2bf372ee13336e3f0525a72d017025a97455 /gm/composeshader.cpp | |
parent | 7f229ed827d1dc5897acfa87d84b642ce34b678f (diff) |
partial switch over to sp usage of shaders
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1776973003
Review URL: https://codereview.chromium.org/1776973003
Diffstat (limited to 'gm/composeshader.cpp')
-rw-r--r-- | gm/composeshader.cpp | 71 |
1 files changed, 26 insertions, 45 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 2f3d99d364..c43b443a07 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -7,7 +7,6 @@ #include "gm.h" -#include "SkBitmapProcShader.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkGraphics.h" @@ -15,7 +14,7 @@ #include "SkString.h" #include "SkXfermode.h" -static SkShader* make_shader(SkXfermode::Mode mode) { +static sk_sp<SkShader> make_shader(SkXfermode::Mode mode) { SkPoint pts[2]; SkColor colors[2]; @@ -23,19 +22,17 @@ static SkShader* make_shader(SkXfermode::Mode mode) { pts[1].set(SkIntToScalar(100), 0); colors[0] = SK_ColorRED; colors[1] = SK_ColorBLUE; - SkAutoTUnref<SkShader> shaderA(SkGradientShader::CreateLinear(pts, colors, nullptr, 2, - SkShader::kClamp_TileMode)); + auto shaderA = SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); pts[0].set(0, 0); pts[1].set(0, SkIntToScalar(100)); colors[0] = SK_ColorBLACK; colors[1] = SkColorSetARGB(0x80, 0, 0, 0); - SkAutoTUnref<SkShader> shaderB(SkGradientShader::CreateLinear(pts, colors, nullptr, 2, - SkShader::kClamp_TileMode)); + auto shaderB = SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(mode)); - return SkShader::CreateComposeShader(shaderA, shaderB, xfer); + return SkShader::MakeComposeShader(std::move(shaderA), std::move(shaderB), xfer); } class ComposeShaderGM : public skiagm::GM { @@ -44,10 +41,6 @@ public: fShader = make_shader(SkXfermode::kDstIn_Mode); } - virtual ~ComposeShaderGM() { - SkSafeUnref(fShader); - } - protected: SkString onShortName() override { return SkString("composeshader"); @@ -58,9 +51,7 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkPaint paint; - paint.setColor(SK_ColorGREEN); canvas->drawRectCoords(0, 0, SkIntToScalar(100), SkIntToScalar(100), paint); paint.setShader(fShader); @@ -68,7 +59,7 @@ protected: } protected: - SkShader* fShader; + sk_sp<SkShader> fShader; private: typedef GM INHERITED ; @@ -88,9 +79,10 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkAutoTUnref<SkShader> shader0(make_shader(SkXfermode::kDstIn_Mode)); - SkAutoTUnref<SkShader> shader1(make_shader(SkXfermode::kSrcOver_Mode)); - SkShader* shaders[] = { shader0.get(), shader1.get() }; + sk_sp<SkShader> shaders[] = { + make_shader(SkXfermode::kDstIn_Mode), + make_shader(SkXfermode::kSrcOver_Mode), + }; SkPaint paint; paint.setColor(SK_ColorGREEN); @@ -98,7 +90,6 @@ protected: const SkRect r = SkRect::MakeXYWH(5, 5, 100, 100); for (size_t y = 0; y < SK_ARRAY_COUNT(shaders); ++y) { - SkShader* shader = shaders[y]; canvas->save(); for (int alpha = 0xFF; alpha > 0; alpha -= 0x28) { paint.setAlpha(0xFF); @@ -106,7 +97,7 @@ protected: canvas->drawRect(r, paint); paint.setAlpha(alpha); - paint.setShader(shader); + paint.setShader(shaders[y]); canvas->drawRect(r, paint); canvas->translate(r.width() + 5, 0); @@ -148,25 +139,20 @@ static void draw_alpha8_bm(SkBitmap* bm, int length) { } // creates a linear gradient shader -static SkShader* make_linear_gradient_shader(int length) { +static sk_sp<SkShader> make_linear_gradient_shader(int length) { SkPoint pts[2]; SkColor colors[2]; pts[0].set(0, 0); pts[1].set(SkIntToScalar(length), 0); colors[0] = SK_ColorBLUE; colors[1] = SkColorSetARGB(0, 0, 0, 0xFF); - return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); + return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); } class ComposeShaderBitmapGM : public skiagm::GM { public: ComposeShaderBitmapGM() {} - ~ComposeShaderBitmapGM() { - SkSafeUnref(fColorBitmapShader); - SkSafeUnref(fAlpha8BitmapShader); - SkSafeUnref(fLinearGradientShader); - } protected: void onOnceBeforeDraw() override { @@ -174,10 +160,10 @@ protected: draw_alpha8_bm(&fAlpha8Bitmap, squareLength); SkMatrix s; s.reset(); - fColorBitmapShader = new SkBitmapProcShader(fColorBitmap, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, &s); - fAlpha8BitmapShader = new SkBitmapProcShader(fAlpha8Bitmap, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, &s); + fColorBitmapShader = SkShader::MakeBitmapShader(fColorBitmap, SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, &s); + fAlpha8BitmapShader = SkShader::MakeBitmapShader(fAlpha8Bitmap, SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, &s); fLinearGradientShader = make_linear_gradient_shader(squareLength); } @@ -192,16 +178,12 @@ protected: void onDraw(SkCanvas* canvas) override { SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(SkXfermode::kDstOver_Mode)); - // gradient should appear over color bitmap - SkAutoTUnref<SkShader> shader0(SkShader::CreateComposeShader(fLinearGradientShader, - fColorBitmapShader, - xfer)); - // gradient should appear over alpha8 bitmap colorized by the paint color - SkAutoTUnref<SkShader> shader1(SkShader::CreateComposeShader(fLinearGradientShader, - fAlpha8BitmapShader, - xfer)); - - SkShader* shaders[] = { shader0.get(), shader1.get() }; + sk_sp<SkShader> shaders[] = { + // gradient should appear over color bitmap + SkShader::MakeComposeShader(fLinearGradientShader, fColorBitmapShader, xfer), + // gradient should appear over alpha8 bitmap colorized by the paint color + SkShader::MakeComposeShader(fLinearGradientShader, fAlpha8BitmapShader, xfer), + }; SkPaint paint; paint.setColor(SK_ColorYELLOW); @@ -210,11 +192,10 @@ protected: SkIntToScalar(squareLength)); for (size_t y = 0; y < SK_ARRAY_COUNT(shaders); ++y) { - SkShader* shader = shaders[y]; canvas->save(); for (int alpha = 0xFF; alpha > 0; alpha -= 0x28) { paint.setAlpha(alpha); - paint.setShader(shader); + paint.setShader(shaders[y]); canvas->drawRect(r, paint); canvas->translate(r.width() + 5, 0); @@ -234,9 +215,9 @@ private: SkBitmap fColorBitmap; SkBitmap fAlpha8Bitmap; - SkShader* fColorBitmapShader{nullptr}; - SkShader* fAlpha8BitmapShader{nullptr}; - SkShader* fLinearGradientShader{nullptr}; + sk_sp<SkShader> fColorBitmapShader; + sk_sp<SkShader> fAlpha8BitmapShader; + sk_sp<SkShader> fLinearGradientShader; typedef GM INHERITED; }; |