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/xfermodes2.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/xfermodes2.cpp')
| -rw-r--r-- | gm/xfermodes2.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 397f4e1e29..db48c03d20 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -99,8 +99,10 @@ private: SkMatrix lm; lm.setScale(SkIntToScalar(16), SkIntToScalar(16)); - fBG = SkShader::MakeBitmapShader(bg, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, - &lm); + fBG.reset(SkShader::CreateBitmapShader(bg, + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &lm)); SkBitmap srcBmp; srcBmp.allocN32Pixels(kSize, kSize); @@ -113,8 +115,9 @@ private: pixels[kSize * y + x] = rowColor; } } - fSrc = SkShader::MakeBitmapShader(srcBmp, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); + fSrc.reset(SkShader::CreateBitmapShader(srcBmp, + SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); SkBitmap dstBmp; dstBmp.allocN32Pixels(kSize, kSize); pixels = reinterpret_cast<SkPMColor*>(dstBmp.getPixels()); @@ -126,8 +129,9 @@ private: pixels[kSize * y + x] = colColor; } } - fDst = SkShader::MakeBitmapShader(dstBmp, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); + fDst.reset(SkShader::CreateBitmapShader(dstBmp, + SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode)); } enum { @@ -135,9 +139,9 @@ private: kSize = 256 >> kShift, }; - sk_sp<SkShader> fBG; - sk_sp<SkShader> fSrc; - sk_sp<SkShader> fDst; + SkAutoTUnref<SkShader> fBG; + SkAutoTUnref<SkShader> fSrc; + SkAutoTUnref<SkShader> fDst; typedef GM INHERITED; }; |