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

gm/skbug_257.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 "SkImage.h"
 #include "SkRRect.h"
 
 static void rotated_checkerboard_shader(SkPaint* paint,
                                         SkColor c1,
                                         SkColor c2,
                                         int size) {
     SkBitmap bm;
     bm.allocN32Pixels(2 * size, 2 * size);
     bm.eraseColor(c1);
     bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2);
     bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2);
     SkMatrix matrix;
     matrix.setScale(0.75f, 0.75f);
     matrix.preRotate(30.0f);
-    SkAutoTUnref<SkShader> shader(
-            SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
-                                         SkShader::kRepeat_TileMode, &matrix));
-    paint->setShader(shader);
+    paint->setShader(
+            SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
+                                       &matrix));
 }
 
 static void exercise_draw_pos_text(SkCanvas* canvas,
                                    const char* text,
                                    SkScalar x, SkScalar y,
                                    const SkPaint& paint) {
     size_t textLen = strlen(text);
     int count = paint.countText(text, textLen);
     SkAutoTArray<SkScalar> widths(count);
     paint.getTextWidths(text, textLen, &widths[0]);
@@ skipping 88 matching lines @@
     SkPaint stroke;
     stroke.setStyle(SkPaint::kStroke_Style);
     stroke.setStrokeWidth(5);
     stroke.setColor(SK_ColorCYAN);
     canvas->drawCircle(size / 2, size / 2, size / 2 - 10, stroke);
     canvas->drawCircle(3 * size / 2, size / 2, size / 2 - 10, stroke);
     canvas->drawCircle(size / 2, 384, size / 2 - 10, stroke);
     canvas->translate(size, size);
     test_text(canvas, size, SK_ColorCYAN, 0.0f);
 }