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