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/imagefilterstransformed.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gm/imagefilterstransformed.cpp') diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp index dc8257ce1d..0906eb3f3c 100644 --- a/gm/imagefilterstransformed.cpp +++ b/gm/imagefilterstransformed.cpp @@ -127,7 +127,7 @@ DEF_SIMPLE_GM(rotate_imagefilter, canvas, 500, 500) { sk_sp filters[] = { nullptr, SkBlurImageFilter::Make(6, 0, nullptr), - SkXfermodeImageFilter::Make(SkBlendMode::kSrcOver, nullptr), + SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcOver_Mode), nullptr), }; for (auto& filter : filters) { -- cgit v1.2.3