diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 10:48:23 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 18:31:29 +0000 |
| commit | 89cb821e9e9033281a33394709a1feed7eb0523a (patch) | |
| tree | 4d1324c9a4e2f341d091268d987f8994cdc805f4 /gm/arithmode.cpp | |
| parent | e94255d456ad86e045e0c3aeab57395566cf49a5 (diff) | |
Separate SkArithmeticImageFilter from SkXfermodeImageFilter.
Change-Id: I145eed7276456b546ca5c66bc1a0f0f74a84f138
Reviewed-on: https://skia-review.googlesource.com/6728
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/arithmode.cpp')
| -rw-r--r-- | gm/arithmode.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gm/arithmode.cpp b/gm/arithmode.cpp index caa3e283bb..aec079cfe2 100644 --- a/gm/arithmode.cpp +++ b/gm/arithmode.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "SkArithmeticImageFilter.h" #include "SkCanvas.h" #include "SkColorPriv.h" #include "SkGradientShader.h" @@ -13,7 +14,6 @@ #include "SkImageSource.h" #include "SkShader.h" #include "SkSurface.h" -#include "SkXfermodeImageFilter.h" #define WW 100 #define HH 32 @@ -109,8 +109,8 @@ protected: canvas->drawImage(dst, 0, 0); canvas->translate(gap, 0); SkPaint paint; - paint.setImageFilter(SkXfermodeImageFilter::MakeArithmetic(k[0], k[1], k[2], k[3], - true, dstFilter, srcFilter, nullptr)); + paint.setImageFilter(SkArithmeticImageFilter::Make(k[0], k[1], k[2], k[3], true, + dstFilter, srcFilter, nullptr)); canvas->saveLayer(&rect, &paint); canvas->restore(); @@ -137,12 +137,10 @@ protected: canvas->translate(gap, 0); sk_sp<SkImageFilter> bg = - SkXfermodeImageFilter::MakeArithmetic(0, 0, -one / 2, 1, enforcePMColor, - dstFilter); + SkArithmeticImageFilter::Make(0, 0, -one / 2, 1, enforcePMColor, dstFilter); SkPaint p; - p.setImageFilter(SkXfermodeImageFilter::MakeArithmetic(0, one / 2, -one, 1, true, - std::move(bg), dstFilter, - nullptr)); + p.setImageFilter(SkArithmeticImageFilter::Make(0, one / 2, -one, 1, true, + std::move(bg), dstFilter, nullptr)); canvas->saveLayer(&rect, &p); canvas->restore(); canvas->translate(gap, 0); |