commit 5671c5b9124f17d33bc14b6d347cdc6fe5d19dc8
author reed <reed@google.com> Wed Mar 09 14:47:34 2016 -0800
committer Commit bot <commit-bot@chromium.org> Wed Mar 09 14:47:34 2016 -0800
tree 534c601a0a5f7d45cfc69d65485dc086f621cd24
parent 6ceeebd37a43d879c120b6ba100ae1febdd67a18

SkImage now has makeShader to return sk_sp

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785473002

Review URL: https://codereview.chromium.org/1785473002

gm/SkLinearBitmapPipelineGM.cpp

diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp
index d3a143c..e93d2ac 100644
--- a/gm/SkLinearBitmapPipelineGM.cpp
+++ b/gm/SkLinearBitmapPipelineGM.cpp
@@ -61,13 +61,12 @@
         info, pmsrc.addr32(), pmsrc.rowBytes())};
     SkPaint paint;
     int32_t storage[300];
-    SkShader* shader = image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
+    paint.setShader(image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
     if (useBilerp) {
         paint.setFilterQuality(SkFilterQuality::kLow_SkFilterQuality);
     } else {
         paint.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality);
     }
-    paint.setShader(shader)->unref();
     const SkShader::ContextRec rec(paint, *mat, nullptr,
                                    SkBlitter::PreferredShaderDest(pmsrc.info()));
     SkASSERT(paint.getShader()->contextSize(rec) <= sizeof(storage));

gm/colorfilterimagefilter.cpp

diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 4ab91f1..b0f67bf 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -70,8 +70,7 @@
     if (!image) {
         return nullptr;
     }
-    return sk_sp<SkShader>(image->newShader(SkShader::kRepeat_TileMode,
-                                            SkShader::kRepeat_TileMode));
+    return image->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
 }
 
 static void sk_gm_get_shaders(SkTDArray<SkShader*>* array) {

gm/image_shader.cpp

diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 084bb95..7ea0202 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -101,10 +101,9 @@
 
         const SkShader::TileMode tile = SkShader::kRepeat_TileMode;
         const SkMatrix localM = SkMatrix::MakeTrans(-50, -50);
-        SkAutoTUnref<SkShader> shader(image->newShader(tile, tile, &localM));
         SkPaint paint;
+        paint.setShader(image->makeShader(tile, tile, &localM));
         paint.setAntiAlias(true);
-        paint.setShader(shader);
         canvas->drawCircle(50, 50, 50, paint);
     }
 

gm/rectangletexture.cpp

diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 0889063..20f2ead 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -164,15 +164,15 @@
 
                     SkPaint clampPaint;
                     clampPaint.setFilterQuality(q);
-                    clampPaint.setShader(rectImg->newShader(SkShader::kClamp_TileMode,
-                                                            SkShader::kClamp_TileMode))->unref();
+                    clampPaint.setShader(rectImg->makeShader(SkShader::kClamp_TileMode,
+                                                             SkShader::kClamp_TileMode));
                     canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), clampPaint);
                     canvas->translate(kWidth * 1.5f + kPad, 0);
 
                     SkPaint repeatPaint;
                     repeatPaint.setFilterQuality(q);
-                    repeatPaint.setShader(rectImg->newShader(SkShader::kRepeat_TileMode,
-                                                             SkShader::kMirror_TileMode))->unref();
+                    repeatPaint.setShader(rectImg->makeShader(SkShader::kRepeat_TileMode,
+                                                              SkShader::kMirror_TileMode));
                     canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), repeatPaint);
                     canvas->translate(1.5f * kWidth + kPad, 0);
             }