From 2cbcd12281ee807214df094964c584c78932e10b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 21:34:16 +0000 Subject: Revert "Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints""" This reverts commit I86875511a13497112827cbaed1dbd7639e9e3d10. legacy (100K) skp failure Original change's description: > Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints"" > > This reverts commit ce02e7175872abde3721df9e5d3ec0ab8384cd8e. > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878 > > Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10 > Reviewed-on: https://skia-review.googlesource.com/2878 > Reviewed-by: Matt Sarett > Commit-Queue: Mike Reed > TBR=msarett@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ife6f0cf3a22b3e8cf885a188f7f44e1ff62e06a5 Reviewed-on: https://skia-review.googlesource.com/2881 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- gm/texturedomaineffect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/texturedomaineffect.cpp') diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index b0d2ecede6..2dd340e425 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -57,14 +57,14 @@ protected: SkColor colors2[] = { SK_ColorMAGENTA, SK_ColorLTGRAY, SK_ColorYELLOW }; paint.setShader(SkGradientShader::MakeSweep(45.f, 55.f, colors2, nullptr, SK_ARRAY_COUNT(colors2))); - paint.setBlendMode(SkBlendMode::kDarken); + paint.setXfermodeMode(SkXfermode::kDarken_Mode); canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, fBmp.width() + 10.f, fBmp.height() + 10.f), paint); SkColor colors3[] = { SK_ColorBLUE, SK_ColorLTGRAY, SK_ColorGREEN }; paint.setShader(SkGradientShader::MakeSweep(25.f, 35.f, colors3, nullptr, SK_ARRAY_COUNT(colors3))); - paint.setBlendMode(SkBlendMode::kLighten); + paint.setXfermodeMode(SkXfermode::kLighten_Mode); canvas.drawOval(SkRect::MakeXYWH(-5.f, -5.f, fBmp.width() + 10.f, fBmp.height() + 10.f), paint); } -- cgit v1.2.3