From 374772bd61951f01bf84fe17bf53d8867681c9ae Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Wed, 5 Oct 2016 17:33:02 -0700
Subject: Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"

This reverts commit c245574ba3d0e2ade6c94b2812de3baa383bf4c4.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002

TBR=

Review-Url: https://codereview.chromium.org/2396953002
---
 gm/imagefilters.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gm/imagefilters.cpp')

diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp
index e9f54a312d..27422b5611 100644
--- a/gm/imagefilters.cpp
+++ b/gm/imagefilters.cpp
@@ -19,7 +19,7 @@
  *
  *  see https://bug.skia.org/3741
  */
-static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, sk_sp<SkImageFilter> imf) {
+static void do_draw(SkCanvas* canvas, SkBlendMode mode, sk_sp<SkImageFilter> imf) {
         SkAutoCanvasRestore acr(canvas, true);
         canvas->clipRect(SkRect::MakeWH(220, 220));
 
@@ -40,7 +40,7 @@ static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, sk_sp<SkImageFilter
 
         paint.setColor(0x660000FF);
         paint.setImageFilter(std::move(imf));
-        paint.setXfermodeMode(mode);
+        paint.setBlendMode(mode);
         canvas->drawOval(r1, paint);
 }
 
@@ -52,8 +52,8 @@ DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) {
                                                                  kNone_SkFilterQuality,
                                                                  nullptr));
 
-        const SkXfermode::Mode modes[] = {
-            SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode
+        const SkBlendMode modes[] = {
+            SkBlendMode::kSrcATop, SkBlendMode::kDstIn
         };
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) {
-- 
cgit v1.2.3