diff options
author | reed <reed@google.com> | 2016-03-13 14:13:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-13 14:13:58 -0700 |
commit | 1a9b9640843a64af8d9d90337ec3b3fea663196a (patch) | |
tree | 37dae22b03c887f2f0087309bbac84c983c828c5 /gm/texturedomaineffect.cpp | |
parent | 9283d20afc27571f7a871d1bd1100dd5df584941 (diff) |
Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )"
This reverts commit 9283d20afc27571f7a871d1bd1100dd5df584941.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1793303002
Review URL: https://codereview.chromium.org/1793303002
Diffstat (limited to 'gm/texturedomaineffect.cpp')
-rw-r--r-- | gm/texturedomaineffect.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 72e40feb49..6bd6490c66 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -50,24 +50,24 @@ protected: SkPaint paint; SkColor colors1[] = { SK_ColorCYAN, SK_ColorLTGRAY, SK_ColorGRAY }; - paint.setShader(SkGradientShader::CreateSweep(65.f, 75.f, colors1, - nullptr, SK_ARRAY_COUNT(colors1)))->unref(); - canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, - fBmp.width() + 10.f, fBmp.height() + 10.f), paint); + paint.setShader(SkGradientShader::MakeSweep(65.f, 75.f, colors1, nullptr, + SK_ARRAY_COUNT(colors1))); + canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, fBmp.width() + 10.f, fBmp.height() + 10.f), + paint); SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW }; - paint.setShader(SkGradientShader::CreateSweep(45.f, 55.f, colors2, nullptr, - SK_ARRAY_COUNT(colors2)))->unref(); + paint.setShader(SkGradientShader::MakeSweep(45.f, 55.f, colors2, nullptr, + SK_ARRAY_COUNT(colors2))); paint.setXfermodeMode(SkXfermode::kDarken_Mode); - canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, - fBmp.width() + 10.f, fBmp.height() + 10.f), paint); + canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, fBmp.width() + 10.f, fBmp.height() + 10.f), + paint); SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN }; - paint.setShader(SkGradientShader::CreateSweep(25.f, 35.f, colors3, nullptr, - SK_ARRAY_COUNT(colors3)))->unref(); + paint.setShader(SkGradientShader::MakeSweep(25.f, 35.f, colors3, nullptr, + SK_ARRAY_COUNT(colors3))); paint.setXfermodeMode(SkXfermode::kLighten_Mode); - canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, - fBmp.width() + 10.f, fBmp.height() + 10.f), paint); + canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, fBmp.width() + 10.f, fBmp.height() + 10.f), + paint); } void onDraw(SkCanvas* canvas) override { |