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/blurroundrect.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/blurroundrect.cpp')
| -rw-r--r-- | gm/blurroundrect.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index c3cdb66673..ef20e25860 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -92,7 +92,7 @@ private: /* * Spits out a dummy gradient to test blur with shader on paint */ -static SkShader* MakeRadial() { +static sk_sp<SkShader> MakeRadial() { SkPoint pts[2] = { { 0, 0 }, { SkIntToScalar(100), SkIntToScalar(100) } @@ -108,10 +108,10 @@ static SkShader* MakeRadial() { SkScalarAve(pts[0].fY, pts[1].fY)); center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); - return SkGradientShader::CreateTwoPointConical(center1, (pts[1].fX - pts[0].fX) / 7, - center0, (pts[1].fX - pts[0].fX) / 2, - colors, pos, SK_ARRAY_COUNT(colors), tm, - 0, &scale); + return SkGradientShader::MakeTwoPointConical(center1, (pts[1].fX - pts[0].fX) / 7, + center0, (pts[1].fX - pts[0].fX) / 2, + colors, pos, SK_ARRAY_COUNT(colors), tm, + 0, &scale); } // Simpler blurred RR test cases where all the radii are the same. @@ -153,7 +153,7 @@ protected: bool useRadial = SkToBool(k); if (useRadial) { - paint.setShader(MakeRadial())->unref(); + paint.setShader(MakeRadial()); } SkRRect rrect; |