Add another dollop of sk_sp to SkSpecialImage and SkSpecialSurface

tests/SpecialImageTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkAutoPixmapStorage.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 225 matching lines @@
     }
 
     {
         // gpu
         GrSurfaceDesc desc;
         desc.fConfig = kSkia8888_GrPixelConfig;
         desc.fFlags = kNone_GrSurfaceFlags;
         desc.fWidth = kFullSize;
         desc.fHeight = kFullSize;
 
-        SkAutoTUnref<GrTexture> texture(context->textureProvider()->createTexture(desc,
-                                                                                  SkBudgeted::kNo,
-                                                                                  bm.getPixels(),
-                                                                                  0));
+        sk_sp<GrTexture> texture(context->textureProvider()->createTexture(desc,
+                                                                           SkBudgeted::kNo,
+                                                                           bm.getPixels(),
+                                                                           0));
         if (!texture) {
             return;
         }
 
         sk_sp<SkSpecialImage> gpuImage(SkSpecialImage::MakeFromGpu(
                                                                 SkIRect::MakeWH(kFullSize,
                                                                                 kFullSize),
                                                                 kNeedNewImageUniqueID_SpecialImage,
-                                                                texture));
+                                                                std::move(texture)));
 
         {
             sk_sp<SkSpecialImage> fromGPU(gpuImage->makeTextureImage(context));
             test_texture_backed(reporter, gpuImage, fromGPU);
         }
 
         {
             sk_sp<SkSpecialImage> subGPUImage(gpuImage->makeSubset(subset));
 
             sk_sp<SkSpecialImage> fromSubGPU(subGPUImage->makeTextureImage(context));
             test_texture_backed(reporter, subGPUImage, fromSubGPU);
         }
     }
 }
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_Gpu, reporter, ctxInfo) {
     GrContext* context = ctxInfo.fGrContext;
     SkBitmap bm = create_bm();
 
     GrSurfaceDesc desc;
     desc.fConfig = kSkia8888_GrPixelConfig;
     desc.fFlags  = kNone_GrSurfaceFlags;
     desc.fWidth  = kFullSize;
     desc.fHeight = kFullSize;
 
-    SkAutoTUnref<GrTexture> texture(context->textureProvider()->createTexture(desc,
-                                                                              SkBudgeted::kNo,
-                                                                              bm.getPixels(), 0));
+    sk_sp<GrTexture> texture(context->textureProvider()->createTexture(desc,
+                                                                       SkBudgeted::kNo,
+                                                                       bm.getPixels(), 0));
     if (!texture) {
         return;
     }
 
     sk_sp<SkSpecialImage> fullSImg(SkSpecialImage::MakeFromGpu(
                                                             SkIRect::MakeWH(kFullSize, kFullSize),
                                                             kNeedNewImageUniqueID_SpecialImage,
                                                             texture));
 
     const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize);
 
     {
         sk_sp<SkSpecialImage> subSImg1(SkSpecialImage::MakeFromGpu(
                                                                subset,
                                                                kNeedNewImageUniqueID_SpecialImage,
                                                                texture));
         test_image(subSImg1, reporter, context, true, kPad, kFullSize);
     }
 
     {
         sk_sp<SkSpecialImage> subSImg2(fullSImg->makeSubset(subset));
         test_image(subSImg2, reporter, context, true, kPad, kFullSize);
     }
 }
 
 #endif