Add another dollop of sk_sp to SkSpecialImage and SkSpecialSurface

src/effects/SkDisplacementMapEffect.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 "SkDisplacementMapEffect.h"
 
 #include "SkBitmap.h"
@@ skipping 305 matching lines @@
         if (!colorTexture || !displTexture) {
             return nullptr;
         }
 
         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;
         SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displTexture.get());
         offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displOffset.fX),
                                   SkIntToScalar(colorOffset.fY - displOffset.fY));
 
         paint.addColorFragmentProcessor(
@@ skipping 13 matching lines @@
         if (!drawContext) {
             return nullptr;
         }
 
         drawContext->drawRect(GrClip::WideOpen(), paint, matrix, SkRect::Make(colorBounds));
 
         offset->fX = bounds.left();
         offset->fY = bounds.top();
         return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(bounds.width(), bounds.height()),
                                            kNeedNewImageUniqueID_SpecialImage,
-                                           dst);
+                                           std::move(dst));
     }
 #endif
 
     SkBitmap colorBM, displBM;
 
     if (!color->getROPixels(&colorBM) || !displ->getROPixels(&displBM)) {
         return nullptr;
     }
 
     if ((colorBM.colorType() != kN32_SkColorType) ||
@@ skipping 255 matching lines @@
 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
                                        const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
     const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMapEffect>();
 
     uint32_t xKey = displacementMap.xChannelSelector();
     uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBits;
 
     b->add32(xKey | yKey);
 }
 #endif