From 70cdb396eb5ffbbed128b902532e9292b5ec0e9d Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Mon, 3 Oct 2016 15:44:23 -0400
Subject: 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 <msarett@google.com>
Commit-Queue: Mike Reed <reed@google.com>
---
 gm/plus.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gm/plus.cpp')

diff --git a/gm/plus.cpp b/gm/plus.cpp
index 6a5af61d80..51ac2cb103 100644
--- a/gm/plus.cpp
+++ b/gm/plus.cpp
@@ -37,7 +37,7 @@ DEF_SIMPLE_GM(PlusMergesAA, canvas, 256, 256) {
 
     // Using Plus on the right should merge the AA of seam together completely covering the red.
     canvas->saveLayer(nullptr, nullptr);
-      p.setXfermodeMode(SkXfermode::kPlus_Mode);
+      p.setBlendMode(SkBlendMode::kPlus);
       canvas->translate(150, 0);
       canvas->drawPath(upperLeft, p);
       canvas->drawPath(bottomRight, p);
-- 
cgit v1.2.3