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

tests/GpuDrawPathTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 31 matching lines @@
     paint.setStrokeWidth(SkIntToScalar(20));
     paint.setStrokeJoin(SkPaint::kRound_Join);
     canvas->drawRect(emptyRect, paint);
     canvas->drawPath(SkPath(), paint);
     canvas->drawOval(emptyRect, paint);
     canvas->drawRect(emptyRect, paint);
     canvas->drawRRect(SkRRect::MakeRect(emptyRect), paint);
 }
 
 static void fill_and_stroke(SkCanvas* canvas, const SkPath& p1, const SkPath& p2,
-                            SkPathEffect* effect) {
+                            sk_sp<SkPathEffect> effect) {
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setPathEffect(effect);
 
     canvas->drawPath(p1, paint);
     canvas->drawPath(p2, paint);
 
     paint.setStyle(SkPaint::kStroke_Style);
     canvas->drawPath(p1, paint);
     canvas->drawPath(p2, paint);
 }
 
 static void test_drawSameRectOvals(skiatest::Reporter*, SkCanvas* canvas) {
     // Drawing ovals with similar bounds but different points order should not crash.
 
     SkPath oval1, oval2;
     const SkRect rect = SkRect::MakeWH(100, 50);
     oval1.addOval(rect, SkPath::kCW_Direction);
     oval2.addOval(rect, SkPath::kCCW_Direction);
 
     fill_and_stroke(canvas, oval1, oval2, nullptr);
 
     const SkScalar intervals[] = { 1, 1 };
-    SkAutoTUnref<SkPathEffect> dashEffect(SkDashPathEffect::Create(intervals, 2, 0));
-    fill_and_stroke(canvas, oval1, oval2, dashEffect);
+    fill_and_stroke(canvas, oval1, oval2, SkDashPathEffect::Make(intervals, 2, 0));
 }
 
 DEF_GPUTEST_FOR_ALL_CONTEXTS(GpuDrawPath, reporter, context) {
     for (auto& test_func : { &test_drawPathEmpty, &test_drawSameRectOvals }) {
         for (auto& sampleCount : {0, 4, 16}) {
             SkImageInfo info = SkImageInfo::MakeN32Premul(255, 255);
             SkAutoTUnref<SkSurface> surface(
                 SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info,
                                            sampleCount, nullptr));
             if (!surface) {
@@ skipping 17 matching lines @@
 
     bool isVolatile;
     GrUniqueKey key1, key2;
     GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
     GrPath::ComputeKey(path1, stroke, &key1, &isVolatile);
     GrPath::ComputeKey(path2, stroke, &key2, &isVolatile);
     REPORTER_ASSERT(reporter, key1 != key2);
 }
 
 #endif