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

gm/pictureshader.cpp

 /*
  * Copyright 2014 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 "SkBitmap.h"
@@ skipping 132 matching lines @@
 
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);
         paint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
 
         canvas->save();
         canvas->concat(matrix);
         canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
         canvas->drawRect(SkRect::MakeXYWH(fSceneSize * 1.1f, 0, fSceneSize, fSceneSize), paint);
 
-        SkAutoTUnref<SkShader> pictureShader(
-                SkShader::CreatePictureShader(fPicture, kTileConfigs[tileMode].tmx,
-                                              kTileConfigs[tileMode].tmy, &localMatrix, nullptr));
-        paint.setShader(pictureShader.get());
+        paint.setShader(SkShader::MakePictureShader(fPicture, kTileConfigs[tileMode].tmx,
+                                                    kTileConfigs[tileMode].tmy, &localMatrix,
+                                                    nullptr));
         canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
 
         canvas->translate(fSceneSize * 1.1f, 0);
 
-        SkAutoTUnref<SkShader> bitmapShader(SkShader::CreateBitmapShader(
-                    fBitmap,
-                    kTileConfigs[tileMode].tmx,
-                    kTileConfigs[tileMode].tmy,
-                    &localMatrix));
-        paint.setShader(bitmapShader.get());
+        paint.setShader(SkShader::MakeBitmapShader(fBitmap,
+                                                   kTileConfigs[tileMode].tmx,
+                                                   kTileConfigs[tileMode].tmy,
+                                                   &localMatrix));
         canvas->drawRect(SkRect::MakeWH(fSceneSize, fSceneSize), paint);
 
         canvas->restore();
     }
 
     SkScalar    fTileSize;
     SkScalar    fSceneSize;
 
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
     SkBitmap fBitmap;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new PictureShaderGM(50, 100);)
 
 DEF_SIMPLE_GM(tiled_picture_shader, canvas, 400, 400) {
     // https://code.google.com/p/skia/issues/detail?id=3398
     SkRect tile = SkRect::MakeWH(100, 100);
 
     SkPictureRecorder recorder;
     SkCanvas* c = recorder.beginRecording(tile);
 
     SkRect r = tile;
     r.inset(4, 4);
     SkPaint p;
     p.setColor(sk_tool_utils::color_to_565(0xFF303F9F));  // dark blue
     c->drawRect(r, p);
     p.setColor(sk_tool_utils::color_to_565(0xFFC5CAE9));  // light blue
     p.setStrokeWidth(10);
     c->drawLine(20, 20, 80, 80, p);
 
-    SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-    SkAutoTUnref<SkShader> shader(
-            SkShader::CreatePictureShader(picture.get(), SkShader::kRepeat_TileMode,
-                                          SkShader::kRepeat_TileMode, nullptr, nullptr));
+    sk_sp<SkPicture> picture(recorder.endRecording());
+    sk_sp<SkShader> shader(SkShader::MakePictureShader(picture, SkShader::kRepeat_TileMode,
+                                                       SkShader::kRepeat_TileMode,
+                                                       nullptr, nullptr));
 
     p.setColor(sk_tool_utils::color_to_565(0xFF8BC34A));  // green
     canvas->drawPaint(p);
 
     canvas->clipRect(SkRect::MakeXYWH(0, 0, 400, 350));
     p.setColor(sk_tool_utils::color_to_565(0xFFB6B6B6));  // gray
     canvas->drawPaint(p);
     p.setShader(shader.get());
 
     canvas->drawPaint(p);
 }