From 403d154591275b631464854e63c6050adf083686 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 26 Sep 2016 18:51:24 -0400 Subject: Revert "Revert "replace Arithmetic xfermode with imagefilter"" This reverts commit 10ff5bfa789b6b602464e8511fdf676c6f5b1bd4. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2680 TBR= Change-Id: Iac2f4d48d227ff426ccf02b7eae280f382ad3580 Reviewed-on: https://skia-review.googlesource.com/2680 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- gm/xfermodeimagefilter.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gm/xfermodeimagefilter.cpp') diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index 0ff0ea9dd1..a0677c796a 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -7,7 +7,6 @@ #include "gm.h" #include "sk_tool_utils.h" -#include "SkArithmeticMode.h" #include "SkImage.h" #include "SkImageSource.h" #include "SkOffsetImageFilter.h" @@ -97,9 +96,7 @@ protected: } } // Test arithmetic mode as image filter - paint.setImageFilter(SkXfermodeImageFilter::Make( - SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), - background)); + paint.setImageFilter(SkXfermodeImageFilter::MakeArithmetic(0, 1, 1, 0, true, background)); DrawClippedBitmap(canvas, fBitmap, paint, x, y); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { -- cgit v1.2.3