diff options
| author |  reed <reed@google.com> | 2016-03-29 11:32:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-29 11:32:50 -0700 |
| commit | cfb6bdf767796c950f89985445738d2d8e7f12b0 (patch) | |
| tree | 5b412fe9d767eef852f55316a99eb9776751ccaf /samplecode/SampleAll.cpp | |
| parent | 3ebd2760dd34da6f5af23e9c7cb1b6a61e9cea9d (diff) | |
switch xfermodes over to sk_sp
waiting on https://codereview.chromium.org/1835163002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832223002
Review URL: https://codereview.chromium.org/1832223002
Diffstat (limited to 'samplecode/SampleAll.cpp')
| -rw-r--r-- | samplecode/SampleAll.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index d3be968ee7..aa08261200 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -382,7 +382,6 @@ protected: SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5); SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); - SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter( 0xff89bc45, 0xff112233); @@ -404,7 +403,7 @@ protected: paint.setColor(SK_ColorGREEN); paint.setStrokeWidth(SkIntToScalar(10)); paint.setStyle(SkPaint::kStroke_Style); - paint.setXfermode(xfermode)->unref(); + paint.setXfermode(SkXfermode::Make(SkXfermode::kXor_Mode)); paint.setColorFilter(lightingFilter); canvas->drawLine(start.fX, start.fY, stop.fX, stop.fY, paint); // should not be green paint.setXfermode(nullptr); @@ -505,8 +504,8 @@ protected: SkColor colors2[] = {SK_ColorBLACK, SkColorSetARGB(0x80, 0, 0, 0)}; auto shaderB = SkGradientShader::MakeLinear(pts, colors2, nullptr, 2, SkShader::kClamp_TileMode); - SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(SkXfermode::kDstIn_Mode)); - return SkShader::MakeComposeShader(shaderA, shaderB, mode); + return SkShader::MakeComposeShader(std::move(shaderA), std::move(shaderB), + SkXfermode::Make(SkXfermode::kDstIn_Mode)); } virtual void startTest() { |