| Index: samplecode/SampleAll.cpp
|
| diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
|
| index 70ecd9fe7e57dea95258bccb8810c738b00a60f3..bba5a1922c06ce70614d85ac4d27ec3c05bfbc58 100644
|
| --- a/samplecode/SampleAll.cpp
|
| +++ b/samplecode/SampleAll.cpp
|
| @@ -383,7 +383,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);
|
|
|
| @@ -405,7 +404,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);
|
| @@ -506,8 +505,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() {
|
|
|