partial switch over to sp usage of shaders

gm/gamma.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 70 matching lines @@
     };
 
     // Necessary for certain Xfermode tests to work (ie some of them output white @ 50% alpha):
     canvas->clear(SK_ColorBLACK);
 
     // *Everything* should be perceptually 50% grey. Only the first rectangle
     // is guaranteed to draw that way, though.
     canvas->save();
 
     // Black/white dither, pixel perfect. This is ground truth.
-    p.setShader(SkShader::CreateBitmapShader(
-        ditherBmp, rpt, rpt))->unref();
+    p.setShader(SkShader::MakeBitmapShader(ditherBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality);
     nextRect("Dither", "Reference");
 
     // Black/white dither, sampled at half-texel offset. Tests bilerp.
     // NOTE: We need to apply a non-identity scale and/or rotation to trick
     // the raster pipeline into *not* snapping to nearest.
     SkMatrix offsetMatrix = SkMatrix::Concat(
         SkMatrix::MakeScale(-1.0f), SkMatrix::MakeTrans(0.5f, 0.0f));
-    p.setShader(SkShader::CreateBitmapShader(
-        ditherBmp, rpt, rpt, &offsetMatrix))->unref();
+    p.setShader(SkShader::MakeBitmapShader(ditherBmp, rpt, rpt, &offsetMatrix));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("Dither", "Bilerp");
 
     // Black/white dither, scaled down by 2x. Tests minification.
     SkMatrix scaleMatrix = SkMatrix::MakeScale(0.5f);
-    p.setShader(SkShader::CreateBitmapShader(
-        ditherBmp, rpt, rpt, &scaleMatrix))->unref();
+    p.setShader(SkShader::MakeBitmapShader(ditherBmp, rpt, rpt, &scaleMatrix));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("Dither", "Scale");
 
     // 50% grey via paint color.
     p.setColor(0xff7f7f7f);
     nextRect("Color", 0);
 
     // Black -> White gradient, scaled to sample just the middle.
     // Tests gradient interpolation.
     SkPoint points[2] = {
         SkPoint::Make(0 - (sz * 10), 0),
         SkPoint::Make(sz + (sz * 10), 0)
     };
     SkColor colors[2] = { SK_ColorBLACK, SK_ColorWHITE };
-    p.setShader(SkGradientShader::CreateLinear(
-        points, colors, nullptr, 2, SkShader::kClamp_TileMode))->unref();
+    p.setShader(SkGradientShader::MakeLinear(points, colors, nullptr, 2,
+                                             SkShader::kClamp_TileMode));
     nextRect("Gradient", 0);
 
     // 50% grey from linear bitmap, with drawBitmap
     nextBitmap(linearGreyBmp, "Lnr BMP");
 
     // 50% grey from sRGB bitmap, with drawBitmap
     nextBitmap(srgbGreyBmp, "sRGB BMP");
 
     // Bitmap wrapped in a shader (linear):
-    p.setShader(SkShader::CreateBitmapShader(linearGreyBmp, rpt, rpt))->unref();
+    p.setShader(SkShader::MakeBitmapShader(linearGreyBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("Lnr BMP", "Shader");
 
     // Bitmap wrapped in a shader (sRGB):
-    p.setShader(SkShader::CreateBitmapShader(srgbGreyBmp, rpt, rpt))->unref();
+    p.setShader(SkShader::MakeBitmapShader(srgbGreyBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("sRGB BMP", "Shader");
 
     // Carriage return.
     canvas->restore();
     canvas->translate(0, 2 * sz);
 
     const U8CPU sqrtHalf = 0xB4;
     const SkColor sqrtHalfAlpha = SkColorSetARGB(sqrtHalf, 0, 0, 0);
     const SkColor sqrtHalfWhite = SkColorSetARGB(0xFF, sqrtHalf, sqrtHalf, sqrtHalf);
@@ skipping 11 matching lines @@
     nextXferRect(sqrtHalfWhite, SkXfermode::kSrcIn_Mode, sqrtHalfAlpha);
     nextXferRect(sqrtHalfAlpha, SkXfermode::kDstIn_Mode, sqrtHalfWhite);
 
     nextXferRect(0xff3f3f3f, SkXfermode::kPlus_Mode, 0xff3f3f3f);
     nextXferRect(sqrtHalfWhite, SkXfermode::kModulate_Mode, sqrtHalfWhite);
 
     canvas->restore();
 
     canvas->restore();
 }