diff options
author | reed <reed@google.com> | 2016-10-05 17:33:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-05 17:33:03 -0700 |
commit | 374772bd61951f01bf84fe17bf53d8867681c9ae (patch) | |
tree | ade94be090be12f7503fd35e77c4dae2dc1f0a47 /gm/lumafilter.cpp | |
parent | 61c21cdcc31081a1bd4a3a7480b482d135f7df33 (diff) |
Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit c245574ba3d0e2ade6c94b2812de3baa383bf4c4.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002
TBR=
Review-Url: https://codereview.chromium.org/2396953002
Diffstat (limited to 'gm/lumafilter.cpp')
-rw-r--r-- | gm/lumafilter.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 10eefabd56..3852d9385f 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -26,7 +26,7 @@ static void draw_label(SkCanvas* canvas, const char* label, paint); } -static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkXfermode::Mode mode, +static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkBlendMode mode, const sk_sp<SkShader>& s1, const sk_sp<SkShader>& s2) { SkPaint paint; paint.setAntiAlias(true); @@ -53,7 +53,7 @@ static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkX } SkPaint xferPaint; - xferPaint.setXfermodeMode(mode); + xferPaint.setBlendMode(mode); canvas->saveLayer(&bounds, &xferPaint); r = bounds; @@ -101,13 +101,14 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkXfermode::Mode modes[] = { SkXfermode::kSrcOver_Mode, - SkXfermode::kDstOver_Mode, - SkXfermode::kSrcATop_Mode, - SkXfermode::kDstATop_Mode, - SkXfermode::kSrcIn_Mode, - SkXfermode::kDstIn_Mode, - }; + SkBlendMode modes[] = { + SkBlendMode::kSrcOver, + SkBlendMode::kDstOver, + SkBlendMode::kSrcATop, + SkBlendMode::kDstATop, + SkBlendMode::kSrcIn, + SkBlendMode::kDstIn, + }; struct { const sk_sp<SkShader>& fShader1; const sk_sp<SkShader>& fShader2; |