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