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

gm/perspshaders.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 "SkGradientShader.h"
 #include "SkImage.h"
@@ skipping 28 matching lines @@
 
     SkISize onISize() override {
         return SkISize::Make(kCellSize*kNumCols, kCellSize*kNumRows);
     }
 
     void onOnceBeforeDraw() override {
         fBitmap = sk_tool_utils::create_checkerboard_bitmap(kCellSize, kCellSize,
                                                             SK_ColorBLUE, SK_ColorYELLOW,
                                                             kCellSize/10);
 
-        fBitmapShader.reset(SkShader::CreateBitmapShader(fBitmap,
-                                                         SkShader::kClamp_TileMode,
-                                                         SkShader::kClamp_TileMode));
+        fBitmapShader = SkShader::MakeBitmapShader(fBitmap, SkShader::kClamp_TileMode,
+                                                   SkShader::kClamp_TileMode);
         SkPoint pts1[] = {
             { 0, 0 },
             { SkIntToScalar(kCellSize), SkIntToScalar(kCellSize) }
         };
         SkPoint pts2[] = {
             { 0, 0 },
             { 0, SkIntToScalar(kCellSize) }
         };
         static const SkColor colors[] = {
             SK_ColorRED, SK_ColorGREEN, SK_ColorRED, SK_ColorGREEN, SK_ColorRED
         };
         static const SkScalar pos[] = { 0, 0.25f, 0.5f, 0.75f, SK_Scalar1 };
 
-        fLinearGrad1.reset(SkGradientShader::CreateLinear(pts1, colors, pos,
-                                                          SK_ARRAY_COUNT(colors),
-                                                          SkShader::kClamp_TileMode));
-        fLinearGrad2.reset(SkGradientShader::CreateLinear(pts2, colors, pos,
-                                                          SK_ARRAY_COUNT(colors),
-                                                          SkShader::kClamp_TileMode));
+        fLinearGrad1 = SkGradientShader::MakeLinear(pts1, colors, pos, SK_ARRAY_COUNT(colors),
+                                                    SkShader::kClamp_TileMode);
+        fLinearGrad2 = SkGradientShader::MakeLinear(pts2, colors, pos, SK_ARRAY_COUNT(colors),
+                                                    SkShader::kClamp_TileMode);
 
         fPerspMatrix.reset();
         fPerspMatrix.setPerspY(SK_Scalar1 / 50);
 
         fPath.moveTo(0, 0);
         fPath.lineTo(0, SkIntToScalar(kCellSize));
         fPath.lineTo(kCellSize/2.0f, kCellSize/2.0f);
         fPath.lineTo(SkIntToScalar(kCellSize), SkIntToScalar(kCellSize));
         fPath.lineTo(SkIntToScalar(kCellSize), 0);
         fPath.close();
@@ skipping 72 matching lines @@
         this->drawRow(canvas, kHigh_SkFilterQuality);
         canvas->translate(0, SkIntToScalar(kCellSize));
     }
 private:
     static const int kCellSize = 50;
     static const int kNumRows = 4;
     static const int kNumCols = 6;
 
     bool                    fDoAA;
     SkPath                  fPath;
-    SkAutoTUnref<SkShader>  fBitmapShader;
-    SkAutoTUnref<SkShader>  fLinearGrad1;
-    SkAutoTUnref<SkShader>  fLinearGrad2;
+    sk_sp<SkShader>         fBitmapShader;
+    sk_sp<SkShader>         fLinearGrad1;
+    sk_sp<SkShader>         fLinearGrad2;
     SkMatrix                fPerspMatrix;
     SkAutoTUnref<SkImage>   fImage;
     SkBitmap                fBitmap;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new PerspShadersGM(true);)
 DEF_GM(return new PerspShadersGM(false);)
 }