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/SampleAARectModes.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/SampleAARectModes.cpp')
| -rw-r--r-- | samplecode/SampleAARectModes.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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<SkXfermode>& 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<SkXfermode> 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(); |