Add another dollop of sk_sp to SkSpecialImage and SkSpecialSurface

src/core/SkSpecialSurface.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 "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
@@ skipping 94 matching lines @@
     return sk_make_sp<SkSpecialSurface_Raster>(pr, subset, props);
 }
 
 #if SK_SUPPORT_GPU
 ///////////////////////////////////////////////////////////////////////////////
 #include "GrContext.h"
 #include "SkGpuDevice.h"
 
 class SkSpecialSurface_Gpu : public SkSpecialSurface_Base {
 public:
-    SkSpecialSurface_Gpu(GrTexture* texture,
+    SkSpecialSurface_Gpu(sk_sp<GrTexture> texture,
                          const SkIRect& subset,
                          const SkSurfaceProps* props)
         : INHERITED(subset, props)
-        , fTexture(SkRef(texture)) {
+        , fTexture(std::move(texture)) {
 
         SkASSERT(fTexture->asRenderTarget());
 
         SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(fTexture->asRenderTarget(), props,
                                                              SkGpuDevice::kUninit_InitContents));
         if (!device) {
             return;
         }
 
         fCanvas.reset(new SkCanvas(device));
         fCanvas->clipRect(SkRect::Make(subset));
     }
 
     ~SkSpecialSurface_Gpu() override { }
 
     sk_sp<SkSpecialImage> onMakeImageSnapshot() override {
+        // Note: we are intentionally zeroing out 'fTexture' here
         return SkSpecialImage::MakeFromGpu(this->subset(),
-                                           kNeedNewImageUniqueID_SpecialImage, fTexture,
+                                           kNeedNewImageUniqueID_SpecialImage,
+                                           std::move(fTexture),
                                            &this->props());
     }
 
 private:
-    SkAutoTUnref<GrTexture> fTexture;
+    sk_sp<GrTexture> fTexture;
 
     typedef SkSpecialSurface_Base INHERITED;
 };
 
 sk_sp<SkSpecialSurface> SkSpecialSurface::MakeFromTexture(const SkIRect& subset,
-                                                          GrTexture* texture,
+                                                          sk_sp<GrTexture> texture,
                                                           const SkSurfaceProps* props) {
     if (!texture->asRenderTarget()) {
         return nullptr;
     }
 
-    return sk_make_sp<SkSpecialSurface_Gpu>(texture, subset, props);
+    return sk_make_sp<SkSpecialSurface_Gpu>(std::move(texture), subset, props);
 }
 
 sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrContext* context,
                                                            const GrSurfaceDesc& desc,
                                                            const SkSurfaceProps* props) {
     if (!context || !SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag)) {
         return nullptr;
     }
 
-    SkAutoTUnref<GrTexture> temp(context->textureProvider()->createApproxTexture(desc));
+    sk_sp<GrTexture> temp(context->textureProvider()->createApproxTexture(desc));
     if (!temp) {
         return nullptr;
     }
 
     const SkIRect subset = SkIRect::MakeWH(desc.fWidth, desc.fHeight);
 
-    return sk_make_sp<SkSpecialSurface_Gpu>(temp, subset, props);
-}
-
-#else
-
-sk_sp<SkSpecialSurface> SkSpecialSurface::MakeFromTexture(const SkIRect& subset,
-                                                          GrTexture*,
-                                                          const SkSurfaceProps*) {
-    return nullptr;
-}
-
-sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrContext* context,
-                                                           const GrSurfaceDesc& desc,
-                                                           const SkSurfaceProps* props) {
-    return nullptr;
+    return sk_make_sp<SkSpecialSurface_Gpu>(std::move(temp), subset, props);
 }
 
 #endif