Add another dollop of sk_sp to SkSpecialImage and SkSpecialSurface

src/effects/SkXfermodeImageFilter.cpp

 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkXfermodeImageFilter.h"
 
 #include "SkCanvas.h"
@@ skipping 151 matching lines @@
                                                             sk_sp<SkSpecialImage> foreground,
                                                             const SkIPoint& foregroundOffset,
                                                             const SkIRect& bounds) const {
     SkASSERT(source->isTextureBacked());
 
     GrContext* context = source->getContext();
 
     sk_sp<GrTexture> backgroundTex, foregroundTex;
     
     if (background) {
-        backgroundTex.reset(background->asTextureRef(context));
+        backgroundTex = background->asTextureRef(context);
     }
 
     if (foreground) {
-        foregroundTex.reset(foreground->asTextureRef(context));
+        foregroundTex = foreground->asTextureRef(context);
     }
 
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = bounds.width();
     desc.fHeight = bounds.height();
     desc.fConfig = kSkia8888_GrPixelConfig;
-    SkAutoTUnref<GrTexture> dst(context->textureProvider()->createApproxTexture(desc));
+    sk_sp<GrTexture> dst(context->textureProvider()->createApproxTexture(desc));
     if (!dst) {
         return nullptr;
     }
 
     GrPaint paint;
     // SRGBTODO: AllowSRGBInputs?
     SkAutoTUnref<const GrFragmentProcessor> bgFP;
 
     if (backgroundTex) {
         SkMatrix backgroundMatrix;
@@ skipping 57 matching lines @@
     if (!drawContext) {
         return nullptr;
     }
 
     SkMatrix matrix;
     matrix.setTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     drawContext->drawRect(GrClip::WideOpen(), paint, matrix, SkRect::Make(bounds));
 
     return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(bounds.width(), bounds.height()),
                                        kNeedNewImageUniqueID_SpecialImage,
-                                       dst.get());
+                                       std::move(dst));
 }
 
 #endif