From c245574ba3d0e2ade6c94b2812de3baa383bf4c4 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 5 Oct 2016 19:59:51 +0000 Subject: Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints" This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8. Reason for revert: new assert from 100K bot Original change's description: > 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 > Commit-Queue: Mike Reed > TBR=reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I848e5a69c5cd67f2c14889f4f0a346652578c4ff Reviewed-on: https://skia-review.googlesource.com/3023 Commit-Queue: Mike Reed Reviewed-by: Mike Reed --- gm/lumafilter.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gm/lumafilter.cpp') diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 3852d9385f..10eefabd56 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& filter, SkBlendMode mode, +static void draw_scene(SkCanvas* canvas, const sk_sp& filter, SkXfermode::Mode mode, const sk_sp& s1, const sk_sp& s2) { SkPaint paint; paint.setAntiAlias(true); @@ -53,7 +53,7 @@ static void draw_scene(SkCanvas* canvas, const sk_sp& filter, SkB } SkPaint xferPaint; - xferPaint.setBlendMode(mode); + xferPaint.setXfermodeMode(mode); canvas->saveLayer(&bounds, &xferPaint); r = bounds; @@ -101,14 +101,13 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkBlendMode modes[] = { - SkBlendMode::kSrcOver, - SkBlendMode::kDstOver, - SkBlendMode::kSrcATop, - SkBlendMode::kDstATop, - SkBlendMode::kSrcIn, - SkBlendMode::kDstIn, - }; + SkXfermode::Mode modes[] = { SkXfermode::kSrcOver_Mode, + SkXfermode::kDstOver_Mode, + SkXfermode::kSrcATop_Mode, + SkXfermode::kDstATop_Mode, + SkXfermode::kSrcIn_Mode, + SkXfermode::kDstIn_Mode, + }; struct { const sk_sp& fShader1; const sk_sp& fShader2; -- cgit v1.2.3