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

gm/srcmode.cpp

 /*
  * Copyright 2012 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 "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
     #include "SkGpuDevice.h"
 #endif
 
 #define W   SkIntToScalar(80)
 #define H   SkIntToScalar(60)
 
 typedef void (*PaintProc)(SkPaint*);
 
 static void identity_paintproc(SkPaint* paint) {
     paint->setShader(nullptr);
 }
 
 static void gradient_paintproc(SkPaint* paint) {
     const SkColor colors[] = { SK_ColorGREEN, SK_ColorBLUE };
     const SkPoint pts[] = { { 0, 0 }, { W, H } };
-    SkShader* s = SkGradientShader::CreateLinear(pts, colors, nullptr,
-                                                 SK_ARRAY_COUNT(colors),
-                                                 SkShader::kClamp_TileMode);
-    paint->setShader(s)->unref();
+    paint->setShader(SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
+                                                  SkShader::kClamp_TileMode));
 }
 
 typedef void (*Proc)(SkCanvas*, const SkPaint&);
 
 static void draw_hair(SkCanvas* canvas, const SkPaint& paint) {
     SkPaint p(paint);
     p.setStrokeWidth(0);
     canvas->drawLine(0, 0, W, H, p);
 }
 
@@ skipping 98 matching lines @@
         surf->draw(canvas, 0, 0, nullptr);
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new SrcModeGM;)