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/perspshaders.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/perspshaders.cpp')
| -rw-r--r-- | gm/perspshaders.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gm/perspshaders.cpp b/gm/perspshaders.cpp index 59fab47fc8..a29ef52f46 100644 --- a/gm/perspshaders.cpp +++ b/gm/perspshaders.cpp @@ -46,9 +46,8 @@ protected: SK_ColorBLUE, SK_ColorYELLOW, kCellSize/10); - fBitmapShader.reset(SkShader::CreateBitmapShader(fBitmap, - SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + fBitmapShader = SkShader::MakeBitmapShader(fBitmap, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode); SkPoint pts1[] = { { 0, 0 }, { SkIntToScalar(kCellSize), SkIntToScalar(kCellSize) } @@ -62,12 +61,10 @@ protected: }; static const SkScalar pos[] = { 0, 0.25f, 0.5f, 0.75f, SK_Scalar1 }; - fLinearGrad1.reset(SkGradientShader::CreateLinear(pts1, colors, pos, - SK_ARRAY_COUNT(colors), - SkShader::kClamp_TileMode)); - fLinearGrad2.reset(SkGradientShader::CreateLinear(pts2, colors, pos, - SK_ARRAY_COUNT(colors), - SkShader::kClamp_TileMode)); + fLinearGrad1 = SkGradientShader::MakeLinear(pts1, colors, pos, SK_ARRAY_COUNT(colors), + SkShader::kClamp_TileMode); + fLinearGrad2 = SkGradientShader::MakeLinear(pts2, colors, pos, SK_ARRAY_COUNT(colors), + SkShader::kClamp_TileMode); fPerspMatrix.reset(); fPerspMatrix.setPerspY(SK_Scalar1 / 50); @@ -160,9 +157,9 @@ private: bool fDoAA; SkPath fPath; - SkAutoTUnref<SkShader> fBitmapShader; - SkAutoTUnref<SkShader> fLinearGrad1; - SkAutoTUnref<SkShader> fLinearGrad2; + sk_sp<SkShader> fBitmapShader; + sk_sp<SkShader> fLinearGrad1; + sk_sp<SkShader> fLinearGrad2; SkMatrix fPerspMatrix; SkAutoTUnref<SkImage> fImage; SkBitmap fBitmap; |