diff options
| author |  reed <reed@google.com> | 2016-03-13 13:01:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 13:01:57 -0700 |
| commit | 9283d20afc27571f7a871d1bd1100dd5df584941 (patch) | |
| tree | 3688fa1847d47e1f2493b040bbe91594f6274cf0 /gm/xfermodes3.cpp | |
| parent | ce563cdd48ec7ce4e0420dd88760df9be9dba50c (diff) | |
Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )
Reason for revert:
seems to have changed pictureshadertile
Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1790353002
Diffstat (limited to 'gm/xfermodes3.cpp')
| -rw-r--r-- | gm/xfermodes3.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index 4cd05df5c4..8c24bf72d1 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -185,17 +185,21 @@ private: SkMatrix lm; lm.setScale(SkIntToScalar(kCheckSize), SkIntToScalar(kCheckSize)); - fBGShader = SkShader::MakeBitmapShader(bg, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, &lm); + fBGShader.reset(SkShader::CreateBitmapShader(bg, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &lm)); SkPaint bmpPaint; - 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)); + 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(); SkBitmap bmp; bmp.allocN32Pixels(kSize, kSize); @@ -206,8 +210,9 @@ private: 7 * SkIntToScalar(kSize) / 8, 7 * SkIntToScalar(kSize) / 8}; bmpCanvas.drawRect(rect, bmpPaint); - fBmpShader = SkShader::MakeBitmapShader(bmp, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); + fBmpShader.reset(SkShader::CreateBitmapShader(bmp, + SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); } enum { @@ -216,8 +221,8 @@ private: kTestsPerRow = 15, }; - sk_sp<SkShader> fBGShader; - sk_sp<SkShader> fBmpShader; + SkAutoTUnref<SkShader> fBGShader; + SkAutoTUnref<SkShader> fBmpShader; typedef GM INHERITED; }; |