diff options
author | Mike Reed <reed@google.com> | 2016-10-05 14:03:43 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 18:31:17 +0000 |
commit | 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d (patch) | |
tree | cfa3f2de434cb5dcabf98720460105964f78bfc3 /gm/lumafilter.cpp | |
parent | dbb84c268bd09d2aa47256b5315a87f891583b6b (diff) |
Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
- perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
Reviewed-on: https://skia-review.googlesource.com/2992
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
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; |