commit fe63045f075165b1be5d3e7fc5c710021d85f53b
author reed <reed@google.com> Fri Mar 25 09:08:00 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 25 09:08:00 2016 -0700
tree c60f764504ba1d622613a432c88e43f7f65c0fec
parent cce49271124ff75c880dc0dfed1489f02c82890b

move setshader to sk_sp, re-using SK_SUPPORT_LEGACY_CREATESHADER_PTR

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

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

gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp
index 8cc3023..c86be07 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -76,8 +76,8 @@
 //    paint.setFilterBitmap(true);
 //    paint.setAlpha(0x80);
 
-    canvas->drawImage(imgR.get(), 0, 0, usePaint ? &paint : nullptr);
-    canvas->drawImage(imgG.get(), 0, 80, usePaint ? &paint : nullptr);
+    canvas->drawImage(imgR, 0, 0, usePaint ? &paint : nullptr);
+    canvas->drawImage(imgG, 0, 80, usePaint ? &paint : nullptr);
     surf->draw(canvas, 0, 160, usePaint ? &paint : nullptr);
 
     SkRect src1, src2, src3;
@@ -92,10 +92,10 @@
     dst3.set(0, 400, 65, 465);
     dst4.set(0, 480, 65, 545);
 
-    canvas->drawImageRect(imgR.get(), src1, dst1, usePaint ? &paint : nullptr);
-    canvas->drawImageRect(imgG.get(), src2, dst2, usePaint ? &paint : nullptr);
-    canvas->drawImageRect(imgR.get(), src3, dst3, usePaint ? &paint : nullptr);
-    canvas->drawImageRect(imgG.get(), dst4, usePaint ? &paint : nullptr);
+    canvas->drawImageRect(imgR, src1, dst1, usePaint ? &paint : nullptr);
+    canvas->drawImageRect(imgG, src2, dst2, usePaint ? &paint : nullptr);
+    canvas->drawImageRect(imgR, src3, dst3, usePaint ? &paint : nullptr);
+    canvas->drawImageRect(imgG, dst4, usePaint ? &paint : nullptr);
 }
 
 class ImageGM : public skiagm::GM {