SkImage now has makeShader to return sk_sp

bench/SkLinearBitmapPipelineBench.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 <memory>
 #include "SkColor.h"
 #include "SkLinearBitmapPipeline.h"
@@ skipping 158 matching lines @@
         SkString name{"Orig"};
         return name;
     }
 
     void onPreDraw(SkCanvas* c) override {
         CommonBitmapFPBenchmark::onPreDraw(c);
 
         SkImage* image = SkImage::NewRasterCopy(
             fInfo, fBitmap.get(), sizeof(SkPMColor) * fSrcSize.fWidth);
         fImage.reset(image);
-        SkShader* shader = fImage->newShader(fXTile, fYTile);
+        fPaint.setShader(fImage->makeShader(fXTile, fYTile));
         if (fUseBilerp) {
             fPaint.setFilterQuality(SkFilterQuality::kLow_SkFilterQuality);
         } else {
             fPaint.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality);
         }
-        fPaint.setShader(shader)->unref();
     }
 
     void onPostDraw(SkCanvas*) override {
 
     }
 
     void onDraw(int loops, SkCanvas*) override {
         int width = fSrcSize.fWidth;
         int height = fSrcSize.fHeight;
 
@@ skipping 92 matching lines @@
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)
 
 DEF_BENCH(return new SkBitmapFPGeneral(
     srcSize, kLinear_SkColorProfileType, mR, true,
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)
 
 DEF_BENCH(return new SkBitmapFPOrigShader(
     srcSize, kLinear_SkColorProfileType, mR, true,
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)