switch xfermodes over to sk_sp

bench/XfermodeBench.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkString.h"
 #include "SkXfermode.h"
 
 // Benchmark that draws non-AA rects or AA text with an SkXfermode::Mode.
 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" : "");
     }
 
     XfermodeBench(SkXfermode* xferMode, const char* name, bool aa) {
         SkASSERT(xferMode);
         fXfermode.reset(xferMode);
         fAA = aa;
         fName.printf("Xfermode_%s%s", name, aa ? "_aa" : "");
     }
 
 protected:
     const char* onGetName() override { return fName.c_str(); }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
         SkISize size = canvas->getDeviceSize();
         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.
                 paint.setAntiAlias(true);
                 paint.setTextSize(random.nextRangeScalar(12, 96));
                 SkScalar x = random.nextRangeScalar(0, (SkScalar)size.fWidth),
                          y = random.nextRangeScalar(0, (SkScalar)size.fHeight);
                 for (int j = 0; j < 1000; ++j) {
                     canvas->drawText(text, len, x, y, paint);
                 }
             } else {
                 // Draw rects to exercise non-AA code paths.
                 SkScalar w = random.nextRangeScalar(50, 100);
                 SkScalar h = random.nextRangeScalar(50, 100);
                 SkRect rect = SkRect::MakeXYWH(
                     random.nextUScalar1() * (size.fWidth - w),
                     random.nextUScalar1() * (size.fHeight - h),
                     w,
                     h
                 );
                 for (int j = 0; j < 1000; ++j) {
                     canvas->drawRect(rect, paint);
                 }
             }
         }
     }
 
 private:
-    SkAutoTUnref<SkXfermode> fXfermode;
-    SkString fName;
-    bool fAA;
+    sk_sp<SkXfermode>   fXfermode;
+    SkString            fName;
+    bool                fAA;
 
     typedef Benchmark INHERITED;
 };
 
 class XferCreateBench : public Benchmark {
 public:
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     const char* onGetName() override { return "xfermode_create"; }
 
     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));
             }
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ skipping 28 matching lines @@
 BENCH(SkXfermode::kDifference_Mode)
 BENCH(SkXfermode::kExclusion_Mode)
 BENCH(SkXfermode::kMultiply_Mode)
 
 BENCH(SkXfermode::kHue_Mode)
 BENCH(SkXfermode::kSaturation_Mode)
 BENCH(SkXfermode::kColor_Mode)
 BENCH(SkXfermode::kLuminosity_Mode)
 
 DEF_BENCH(return new XferCreateBench;)