From 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 5 Oct 2016 14:03:43 -0400 Subject: 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 --- gm/xfermodes2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/xfermodes2.cpp') diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 6f7d05475c..03da0d3317 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -40,7 +40,7 @@ protected: SkScalar x = 0, y = 0; for (size_t m = 0; m <= SkXfermode::kLastMode; m++) { - SkXfermode::Mode mode = static_cast(m); + SkBlendMode mode = static_cast(m); canvas->save(); @@ -57,7 +57,7 @@ protected: p.setShader(fDst); canvas->drawRect(r, p); p.setShader(fSrc); - p.setXfermode(SkXfermode::Make(mode)); + p.setBlendMode(mode); canvas->drawRect(r, p); canvas->restore(); @@ -65,7 +65,7 @@ protected: r.inset(-SK_ScalarHalf, -SK_ScalarHalf); p.setStyle(SkPaint::kStroke_Style); p.setShader(nullptr); - p.setXfermode(nullptr); + p.setBlendMode(SkBlendMode::kSrcOver); canvas->drawRect(r, p); canvas->restore(); -- cgit v1.2.3