SkImage now has makeShader to return sk_sp

src/image/SkImageShader.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcShader.h"
 #include "SkBitmapProvider.h"
 #include "SkImage_Base.h"
@@ skipping 10 matching lines @@
 
 SkFlattenable* SkImageShader::CreateProc(SkReadBuffer& buffer) {
     const TileMode tx = (TileMode)buffer.readUInt();
     const TileMode ty = (TileMode)buffer.readUInt();
     SkMatrix matrix;
     buffer.readMatrix(&matrix);
     SkAutoTUnref<SkImage> img(buffer.readImage());
     if (!img) {
         return nullptr;
     }
-    return new SkImageShader(img, tx, ty, &matrix);
+    return SkImageShader::Make(img, tx, ty, &matrix).release();
 }
 
 void SkImageShader::flatten(SkWriteBuffer& buffer) const {
     buffer.writeUInt(fTileModeX);
     buffer.writeUInt(fTileModeY);
     buffer.writeMatrix(this->getLocalMatrix());
     buffer.writeImage(fImage);
 }
 
 bool SkImageShader::isOpaque() const {
     return fImage->isOpaque();
 }
 
 size_t SkImageShader::onContextSize(const ContextRec& rec) const {
     return SkBitmapProcShader::ContextSize(rec, SkBitmapProvider(fImage).info());
 }
 
 SkShader::Context* SkImageShader::onCreateContext(const ContextRec& rec, void* storage) const {
     return SkBitmapProcShader::MakeContext(*this, fTileModeX, fTileModeY,
                                            SkBitmapProvider(fImage), rec, storage);
 }
 
-SkShader* SkImageShader::Create(const SkImage* image, TileMode tx, TileMode ty,
-                                const SkMatrix* localMatrix) {
+sk_sp<SkShader> SkImageShader::Make(const SkImage* image, TileMode tx, TileMode ty,
+                                    const SkMatrix* localMatrix) {
     if (!image) {
         return nullptr;
     }
-    return new SkImageShader(image, tx, ty, localMatrix);
+    return sk_sp<SkShader>(new SkImageShader(image, tx, ty, localMatrix));
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkImageShader::toString(SkString* str) const {
     const char* gTileModeName[SkShader::kTileModeCount] = {
         "clamp", "repeat", "mirror"
     };
 
     str->appendf("ImageShader: ((%s %s) ", gTileModeName[fTileModeX], gTileModeName[fTileModeY]);
     fImage->toString(str);
@@ skipping 55 matching lines @@
         inner.reset(GrSimpleTextureEffect::Create(texture, matrix, params));
     }
 
     if (GrPixelConfigIsAlphaOnly(texture->config())) {
         return SkRef(inner.get());
     }
     return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 #endif