switch xfermodes over to sk_sp

waiting on https://codereview.chromium.org/1835163002/

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832223002

Review URL: https://codereview.chromium.org/1832223002

4 files changed, 16 insertions, 22 deletions

diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index edd5ac7de2..46a515de29 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp
@@ -85,11 +85,7 @@ private:
 class SrcModeRectBench : public RectBench {
 public:
     SrcModeRectBench() : INHERITED(1, 0) {
-        fMode = SkXfermode::Create(SkXfermode::kSrc_Mode);
-    }
-
-    virtual ~SrcModeRectBench() {
-        SkSafeUnref(fMode);
+        fMode = SkXfermode::Make(SkXfermode::kSrc_Mode);
     }
 
 protected:
@@ -108,7 +104,7 @@ protected:
 
 private:
     SkString fName;
-    SkXfermode* fMode;
+    sk_sp<SkXfermode> fMode;
 
     typedef RectBench INHERITED;
 };
diff --git a/bench/Xfer4fBench.cpp b/bench/Xfer4fBench.cpp
index ab04476cf2..6ea7a4f7e2 100644
--- a/bench/Xfer4fBench.cpp
+++ b/bench/Xfer4fBench.cpp
@@ -21,8 +21,7 @@ public:
         : fDoN(doN)
         , fFlags(flags & ~USE_AA)
     {
-        fXfer.reset(SkXfermode::Create(mode));
-
+        fXfer = SkXfermode::Make(mode);
         fProc1 = SkXfermode::GetD32Proc(fXfer, fFlags | SkXfermode::kSrcIsSingle_D32Flag);
         fProcN = SkXfermode::GetD32Proc(fXfer, fFlags);
         fName.printf("xfer4f_%s_%s_%c_%s_%s",
@@ -53,15 +52,15 @@ protected:
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops * INNER_LOOPS; ++i) {
             if (fDoN) {
-                fProcN(fXfer, fDst, fSrc, N, fAA);
+                fProcN(fXfer.get(), fDst, fSrc, N, fAA);
             } else {
-                fProc1(fXfer, fDst, fSrc, N, fAA);
+                fProc1(fXfer.get(), fDst, fSrc, N, fAA);
             }
         }
     }
 
 private:
-    SkAutoTUnref<SkXfermode> fXfer;
+    sk_sp<SkXfermode>   fXfer;
     SkString             fName;
     SkXfermode::D32Proc  fProc1;
     SkXfermode::D32Proc  fProcN;
diff --git a/bench/XferU64Bench.cpp b/bench/XferU64Bench.cpp
index 90aa328b40..324655b351 100644
--- a/bench/XferU64Bench.cpp
+++ b/bench/XferU64Bench.cpp
@@ -21,7 +21,7 @@ public:
         : fDoN(doN)
         , fFlags(flags & ~USE_AA)
     {
-        fXfer.reset(SkXfermode::Create(mode));
+        fXfer = SkXfermode::Make(mode);
 
         fProc1 = SkXfermode::GetD64Proc(fXfer, fFlags | SkXfermode::kSrcIsSingle_D64Flag);
         fProcN = SkXfermode::GetD64Proc(fXfer, fFlags);
@@ -53,15 +53,15 @@ protected:
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops * INNER_LOOPS; ++i) {
             if (fDoN) {
-                fProcN(fXfer, fDst, fSrc, N, fAA);
+                fProcN(fXfer.get(), fDst, fSrc, N, fAA);
             } else {
-                fProc1(fXfer, fDst, fSrc, N, fAA);
+                fProc1(fXfer.get(), fDst, fSrc, N, fAA);
             }
         }
     }
 
 private:
-    SkAutoTUnref<SkXfermode> fXfer;
+    sk_sp<SkXfermode>   fXfer;
     SkString            fName;
     SkXfermode::D64Proc fProc1;
     SkXfermode::D64Proc fProcN;
diff --git a/bench/XfermodeBench.cpp b/bench/XfermodeBench.cpp
index 9eae7cef6c..829c437e09 100644
--- a/bench/XfermodeBench.cpp
+++ b/bench/XfermodeBench.cpp
@@ -16,7 +16,7 @@
 class XfermodeBench : public Benchmark {
 public:
     XfermodeBench(SkXfermode::Mode mode, bool aa) {
-        fXfermode.reset(SkXfermode::Create(mode));
+        fXfermode = SkXfermode::Make(mode);
         fAA = aa;
         SkASSERT(fXfermode.get() || SkXfermode::kSrcOver_Mode == mode);
         fName.printf("Xfermode_%s%s", SkXfermode::ModeName(mode), aa ? "_aa" : "");
@@ -39,7 +39,7 @@ protected:
         SkRandom random;
         for (int i = 0; i < loops; ++i) {
             SkPaint paint;
-            paint.setXfermode(fXfermode.get());
+            paint.setXfermode(fXfermode);
             paint.setColor(random.nextU());
             if (fAA) {
                 // Draw text to exercise AA code paths.
@@ -68,9 +68,9 @@ protected:
     }
 
 private:
-    SkAutoTUnref<SkXfermode> fXfermode;
-    SkString fName;
-    bool fAA;
+    sk_sp<SkXfermode>   fXfermode;
+    SkString            fName;
+    bool                fAA;
 
     typedef Benchmark INHERITED;
 };
@@ -87,8 +87,7 @@ protected:
     void onDraw(int loops, SkCanvas* canvas) override {
         for (int outer = 0; outer < loops * 10; ++outer) {
             for (int i = 0; i <= SkXfermode::kLastMode; ++i) {
-                SkXfermode* xfer = SkXfermode::Create(SkXfermode::Mode(i));
-                SkSafeUnref(xfer);
+                (void)SkXfermode::Make(SkXfermode::Mode(i));
             }
         }
     }