From cfb6bdf767796c950f89985445738d2d8e7f12b0 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 29 Mar 2016 11:32:50 -0700 Subject: 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 --- samplecode/SampleAARectModes.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'samplecode/SampleAARectModes.cpp') diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp index 43392235c9..8066e682b1 100644 --- a/samplecode/SampleAARectModes.cpp +++ b/samplecode/SampleAARectModes.cpp @@ -35,9 +35,7 @@ const int gHeight = 64; const SkScalar W = SkIntToScalar(gWidth); const SkScalar H = SkIntToScalar(gHeight); -static SkScalar drawCell(SkCanvas* canvas, SkXfermode* mode, - SkAlpha a0, SkAlpha a1) { - +static SkScalar drawCell(SkCanvas* canvas, const sk_sp& mode, SkAlpha a0, SkAlpha a1) { SkPaint paint; paint.setAntiAlias(true); @@ -109,17 +107,15 @@ protected: canvas->translate(W * 5, 0); canvas->save(); } - SkXfermode* mode = SkXfermode::Create(gModes[i].fMode); + sk_sp mode = SkXfermode::Make(gModes[i].fMode); canvas->drawRect(bounds, fBGPaint); canvas->saveLayer(&bounds, nullptr); - SkScalar dy = drawCell(canvas, mode, - gAlphaValue[alpha & 1], + SkScalar dy = drawCell(canvas, mode, gAlphaValue[alpha & 1], gAlphaValue[alpha & 2]); canvas->restore(); canvas->translate(0, dy * 5 / 4); - SkSafeUnref(mode); } canvas->restore(); canvas->restore(); -- cgit v1.2.3