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 /gm/aaxfermodes.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 'gm/aaxfermodes.cpp')
-rw-r--r-- | gm/aaxfermodes.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index f1264db964..2ea1844e27 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -210,7 +210,7 @@ protected: if (maxSum > 255) { SkPaint dimPaint; dimPaint.setAntiAlias(false); - dimPaint.setXfermode(SkXfermode::Create(SkXfermode::kDstIn_Mode)); + dimPaint.setXfermode(SkXfermode::Make(SkXfermode::kDstIn_Mode)); if (255 != paint->getAlpha()) { // Dim the src and dst colors. dimPaint.setARGB(255 * 255 / maxSum, 0, 0, 0); @@ -230,13 +230,13 @@ protected: SkPaint shapePaint(paint); shapePaint.setAntiAlias(kSquare_Shape != shape); - SkAutoTUnref<SkXfermode> xfermode; + sk_sp<SkXfermode> xfermode; if (mode <= SkXfermode::kLastMode) { - xfermode.reset(SkXfermode::Create(mode)); + xfermode = SkXfermode::Make(mode); } else { - xfermode.reset(SkArithmeticMode::Create(+1.0f, +0.25f, -0.5f, +0.1f)); + xfermode = SkArithmeticMode::Make(+1.0f, +0.25f, -0.5f, +0.1f); } - shapePaint.setXfermode(xfermode); + shapePaint.setXfermode(std::move(xfermode)); switch (shape) { case kSquare_Shape: |