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/xfermodes3.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/xfermodes3.cpp')
| -rw-r--r-- | gm/xfermodes3.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index 8c24bf72d1..4cd05df5c4 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -185,21 +185,17 @@ private: SkMatrix lm; lm.setScale(SkIntToScalar(kCheckSize), SkIntToScalar(kCheckSize)); - fBGShader.reset(SkShader::CreateBitmapShader(bg, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - &lm)); + fBGShader = SkShader::MakeBitmapShader(bg, SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, &lm); SkPaint bmpPaint; - static const SkPoint kCenter = { SkIntToScalar(kSize) / 2, SkIntToScalar(kSize) / 2 }; - static const SkColor kColors[] = { SK_ColorTRANSPARENT, 0x80800000, - 0xF020F060, SK_ColorWHITE }; - bmpPaint.setShader(SkGradientShader::CreateRadial(kCenter, - 3 * SkIntToScalar(kSize) / 4, - kColors, - nullptr, - SK_ARRAY_COUNT(kColors), - SkShader::kRepeat_TileMode))->unref(); + const SkPoint kCenter = { SkIntToScalar(kSize) / 2, SkIntToScalar(kSize) / 2 }; + const SkColor kColors[] = { + SK_ColorTRANSPARENT, 0x80800000, 0xF020F060, SK_ColorWHITE + }; + bmpPaint.setShader(SkGradientShader::MakeRadial(kCenter, 3 * SkIntToScalar(kSize) / 4, + kColors, nullptr, SK_ARRAY_COUNT(kColors), + SkShader::kRepeat_TileMode)); SkBitmap bmp; bmp.allocN32Pixels(kSize, kSize); @@ -210,9 +206,8 @@ private: 7 * SkIntToScalar(kSize) / 8, 7 * SkIntToScalar(kSize) / 8}; bmpCanvas.drawRect(rect, bmpPaint); - fBmpShader.reset(SkShader::CreateBitmapShader(bmp, - SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + fBmpShader = SkShader::MakeBitmapShader(bmp, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode); } enum { @@ -221,8 +216,8 @@ private: kTestsPerRow = 15, }; - SkAutoTUnref<SkShader> fBGShader; - SkAutoTUnref<SkShader> fBmpShader; + sk_sp<SkShader> fBGShader; + sk_sp<SkShader> fBmpShader; typedef GM INHERITED; }; |