Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium…

gm/rectangletexture.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.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 24 matching lines @@
     }
 
     void fillPixels(int width, int height, void *pixels) {
         SkBitmap bmp;
         bmp.setInfo(SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType), width * 4);
         bmp.setPixels(pixels);
         SkPaint paint;
         SkCanvas canvas(bmp);
         SkPoint pts[] = { {0, 0}, {0, SkIntToScalar(height)} };
         SkColor colors0[] = { 0xFF1060B0 , 0xFF102030 };
-        paint.setShader(SkGradientShader::CreateLinear(pts, colors0, nullptr, 2,
-                                                       SkShader::kClamp_TileMode))->unref();
+        paint.setShader(SkGradientShader::MakeLinear(pts, colors0, nullptr, 2,
+                                                     SkShader::kClamp_TileMode));
         canvas.drawPaint(paint);
 
         SkColor colors1[] = { 0xFFA07010 , 0xFFA02080 };
         paint.setAntiAlias(true);
-        paint.setShader(SkGradientShader::CreateLinear(pts, colors1, nullptr, 2,
-                                                       SkShader::kClamp_TileMode))->unref();
+        paint.setShader(SkGradientShader::MakeLinear(pts, colors1, nullptr, 2,
+                                                     SkShader::kClamp_TileMode));
         canvas.drawCircle(SkIntToScalar(width) / 2, SkIntToScalar(height) / 2,
                           SkIntToScalar(width + height) / 5, paint);
     }
 
     SkImage* createRectangleTextureImg(GrContext* context, int width, int height, void* pixels) {
         if (!context) {
             return nullptr;
         }
         GrGpu* gpu = context->getGpu();
         if (!gpu) {
@@ skipping 119 matching lines @@
     }
 
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM(return new RectangleTexture;)
 }
 
 #endif