Reland of "switch patheffects over to sk_sp (patchset #5 id:80001 of https://codereview.chromium.or…

gm/bug530095.cpp

Index: gm/bug530095.cpp
diff --git a/gm/bug530095.cpp b/gm/bug530095.cpp
index 76f6bc8f2e55f15cb80714ab2f2f02ac94f45548..fa88c01b8fc8f53e634fb49b53aa116eb0b88fea 100644
--- a/gm/bug530095.cpp
+++ b/gm/bug530095.cpp
@@ -20,13 +20,13 @@ DEF_SIMPLE_GM(bug530095, canvas, 900, 1200) {
     paint.setStrokeWidth(26);
     SkScalar intervals[] = {700, 700 };
     int intervalCount = (int) SK_ARRAY_COUNT(intervals);
-    paint.setPathEffect(SkDashPathEffect::Create(intervals, intervalCount, -40))->unref();
+    paint.setPathEffect(SkDashPathEffect::Make(intervals, intervalCount, -40));
     canvas->drawPath(path1, paint);
 
     paint.setStrokeWidth(0.26f);
     SkScalar smIntervals[] = {7, 7 };
     int smIntervalCount = (int) SK_ARRAY_COUNT(smIntervals);
-    paint.setPathEffect(SkDashPathEffect::Create(smIntervals, smIntervalCount, -0.40f))->unref();
+    paint.setPathEffect(SkDashPathEffect::Make(smIntervals, smIntervalCount, -0.40f));
     canvas->save();
     canvas->scale(100, 100);
     canvas->translate(4, 0);
@@ -34,14 +34,14 @@ DEF_SIMPLE_GM(bug530095, canvas, 900, 1200) {
     canvas->restore();
 
     paint.setStrokeWidth(26);
-    paint.setPathEffect(SkDashPathEffect::Create(intervals, intervalCount, 0))->unref();
+    paint.setPathEffect(SkDashPathEffect::Make(intervals, intervalCount, 0));
     canvas->save();
     canvas->translate(0, 400);
     canvas->drawPath(path1, paint);
     canvas->restore();
 
     paint.setStrokeWidth(0.26f);
-    paint.setPathEffect(SkDashPathEffect::Create(smIntervals, smIntervalCount, 0))->unref();
+    paint.setPathEffect(SkDashPathEffect::Make(smIntervals, smIntervalCount, 0));
     canvas->scale(100, 100);
     canvas->translate(4, 4);
     canvas->drawPath(path2, paint);
@@ -54,8 +54,7 @@ DEF_SIMPLE_GM(bug591993, canvas, 40, 140) {
     p.setStyle(SkPaint::kStroke_Style);
     p.setStrokeCap(SkPaint::kRound_Cap);
     p.setStrokeWidth(10);
-    SkScalar intervals[] = { 100, 100 };
-    SkPathEffect* dash = SkDashPathEffect::Create(intervals, SK_ARRAY_COUNT(intervals), 100);
-    p.setPathEffect(dash)->unref();
+    const SkScalar intervals[] = { 100, 100 };
+    p.setPathEffect(SkDashPathEffect::Make(intervals, SK_ARRAY_COUNT(intervals), 100));
     canvas->drawLine(20, 20, 120, 20, p);
 }