remove use of xfermode* in procs

BUG=skia:

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

Change-Id: I99f35924ff5325dfac527bb573a86d2d0366e0b3
Reviewed-on: https://skia-review.googlesource.com/4592
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Reed <reed@google.com>

2 files changed, 34 insertions, 35 deletions

diff --git a/bench/Xfer4fBench.cpp b/bench/Xfer4fBench.cpp
index 6ea7a4f7e2..0e99c8c3f2 100644
--- a/bench/Xfer4fBench.cpp
+++ b/bench/Xfer4fBench.cpp
@@ -17,13 +17,13 @@
 // Benchmark that draws non-AA rects or AA text with an SkXfermode::Mode.
 class XferD32Bench : public Benchmark {
 public:
-    XferD32Bench(SkXfermode::Mode mode, const char name[], bool doN, uint32_t flags)
+    XferD32Bench(SkBlendMode mode, const char name[], bool doN, uint32_t flags)
         : fDoN(doN)
         , fFlags(flags & ~USE_AA)
     {
-        fXfer = SkXfermode::Make(mode);
-        fProc1 = SkXfermode::GetD32Proc(fXfer, fFlags | SkXfermode::kSrcIsSingle_D32Flag);
-        fProcN = SkXfermode::GetD32Proc(fXfer, fFlags);
+        fMode = mode;
+        fProc1 = SkXfermode::GetD32Proc(fMode, fFlags | SkXfermode::kSrcIsSingle_D32Flag);
+        fProcN = SkXfermode::GetD32Proc(fMode, fFlags);
         fName.printf("xfer4f_%s_%s_%c_%s_%s",
                      name,
                      (flags & USE_AA) ? "aa" : "bw",
@@ -52,15 +52,15 @@ protected:
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops * INNER_LOOPS; ++i) {
             if (fDoN) {
-                fProcN(fXfer.get(), fDst, fSrc, N, fAA);
+                fProcN(fMode, fDst, fSrc, N, fAA);
             } else {
-                fProc1(fXfer.get(), fDst, fSrc, N, fAA);
+                fProc1(fMode, fDst, fSrc, N, fAA);
             }
         }
     }
 
 private:
-    sk_sp<SkXfermode>   fXfer;
+    SkBlendMode          fMode;
     SkString             fName;
     SkXfermode::D32Proc  fProc1;
     SkXfermode::D32Proc  fProcN;
@@ -83,22 +83,22 @@ private:
 #define F10 (SkXfermode::kDstIsSRGB_D32Flag)
 #define F11 (SkXfermode::kSrcIsOpaque_D32Flag | SkXfermode::kDstIsSRGB_D32Flag)
 
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F10); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F00); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F11); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F01); )
-
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F10); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F00); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F11); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F01); )
-
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F10 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F00 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F11 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", false, F01 | USE_AA); )
-
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F10 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F00 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F11 | USE_AA); )
-DEF_BENCH( return new XferD32Bench(SkXfermode::kSrcOver_Mode, "srcover", true,  F01 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F10); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F00); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F11); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F01); )
+
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F10); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F00); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F11); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F01); )
+
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F10 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F00 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F11 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", false, F01 | USE_AA); )
+
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F10 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F00 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F11 | USE_AA); )
+DEF_BENCH( return new XferD32Bench(SkBlendMode::kSrcOver, "srcover", true,  F01 | USE_AA); )
diff --git a/bench/XferF16Bench.cpp b/bench/XferF16Bench.cpp
index 6a7d27a926..14505fd6bf 100644
--- a/bench/XferF16Bench.cpp
+++ b/bench/XferF16Bench.cpp
@@ -17,14 +17,13 @@
 // Benchmark that draws non-AA rects or AA text with an SkXfermode::Mode.
 class XferF16Bench : public Benchmark {
 public:
-    XferF16Bench(SkXfermode::Mode mode, const char name[], bool doN, uint32_t flags)
+    XferF16Bench(SkBlendMode mode, const char name[], bool doN, uint32_t flags)
         : fDoN(doN)
         , fFlags(flags & ~USE_AA)
     {
-        fXfer = SkXfermode::Make(mode);
-
-        fProc1 = SkXfermode::GetF16Proc(fXfer, fFlags | SkXfermode::kSrcIsSingle_F16Flag);
-        fProcN = SkXfermode::GetF16Proc(fXfer, fFlags);
+        fMode = mode;
+        fProc1 = SkXfermode::GetF16Proc(mode, fFlags | SkXfermode::kSrcIsSingle_F16Flag);
+        fProcN = SkXfermode::GetF16Proc(mode, fFlags);
         fName.printf("xferF16_%s_%s_%c_%s",
                      name,
                      (flags & USE_AA) ? "aa" : "bw",
@@ -52,15 +51,15 @@ protected:
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops * INNER_LOOPS; ++i) {
             if (fDoN) {
-                fProcN(fXfer.get(), fDst, fSrc, N, fAA);
+                fProcN(fMode, fDst, fSrc, N, fAA);
             } else {
-                fProc1(fXfer.get(), fDst, fSrc, N, fAA);
+                fProc1(fMode, fDst, fSrc, N, fAA);
             }
         }
     }
 
 private:
-    sk_sp<SkXfermode>   fXfer;
+    SkBlendMode         fMode;
     SkString            fName;
     SkXfermode::F16Proc fProc1;
     SkXfermode::F16Proc fProcN;
@@ -81,7 +80,7 @@ private:
 #define F00 0
 #define F01 (SkXfermode::kSrcIsOpaque_F16Flag)
 
-#define MODE    SkXfermode::kSrcOver_Mode
+#define MODE    SkBlendMode::kSrcOver
 #define NAME    "srcover"
 
 DEF_BENCH( return new XferF16Bench(MODE, NAME, true,  F00 | USE_AA); )