commit 2db83612576d64935bd88747cf9855e79cad70d4
author Hal Canary <halcanary@google.com> Fri Nov 04 13:02:54 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 07 15:17:32 2016 +0000
tree 2e9cbd612abc2a52dc1bb8c594d328ddee2b93fa
parent 12313f072b3563d652a789e28140f70b48e57e03

bench, samples, etc: s/SkAutoTUnref/sk_sp/

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

Change-Id: Ice071684ac8a99e4bb405b4b9be8e8f42c7bac42
Reviewed-on: https://skia-review.googlesource.com/4437
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 6722429..75827ff 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -241,7 +241,7 @@
         fActualColorBits = SkTMax(attachmentInfo.fColorBits, 24);
 
         SkASSERT(nullptr == fCurIntf);
-        SkAutoTUnref<const GrGLInterface> glInterface;
+        sk_sp<const GrGLInterface> glInterface;
         switch (win->getDeviceType()) {
             case kRaster_DeviceType:    // fallthrough
             case kGPU_DeviceType:

samplecode/SampleLitAtlas.cpp

diff --git a/samplecode/SampleLitAtlas.cpp b/samplecode/SampleLitAtlas.cpp
index 149da98..ee639d3 100644
--- a/samplecode/SampleLitAtlas.cpp
+++ b/samplecode/SampleLitAtlas.cpp
@@ -492,7 +492,7 @@
     }
 
     void onDrawContent(SkCanvas* canvas) override {
-        canvas->drawDrawable(fDrawable);
+        canvas->drawDrawable(fDrawable.get());
         this->inval(NULL);
     }
 
@@ -506,7 +506,7 @@
 #endif
 
 private:
-    SkAutoTUnref<DrawLitAtlasDrawable> fDrawable;
+    sk_sp<DrawLitAtlasDrawable> fDrawable;
 
     typedef SampleView INHERITED;
 };

samplecode/SampleXfer.cpp

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index c0ad000..738541f 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -153,20 +153,20 @@
     };
 
     SkRect        fModeRect[N_Modes];
-    SkAutoTUnref<CircDrawable> fDrs[N];
+    sk_sp<CircDrawable> fDrs[N];
     CircDrawable* fSelected;
 
     void addButtons() {
         SkScalar x = 10;
         SkScalar y = 10;
         for (int i = 0; i < N_Modes; ++i) {
-            SkAutoTUnref<SkView> v(new PushButtonWig(gModes[i].fName, (int)gModes[i].fMode));
+            sk_sp<SkView> v(new PushButtonWig(gModes[i].fName, (int)gModes[i].fMode));
             v->setSize(70, 25);
             v->setLoc(x, y);
             v->setVisibleP(true);
             v->setEnabledP(true);
             v->addListenerID(this->getSinkID());
-            this->attachChildToFront(v);
+            this->attachChildToFront(v.get());
             fModeRect[i] = SkRect::MakeXYWH(x, y + 28, 70, 2);
             x += 80;
         }
@@ -227,7 +227,7 @@
         fSelected = nullptr;
         for (int i = N - 1; i >= 0; --i) {
             if (fDrs[i]->hitTest(x, y)) {
-                fSelected = fDrs[i];
+                fSelected = fDrs[i].get();
                 break;
             }
         }