diff options
| author |  reed <reed@google.com> | 2016-03-18 11:22:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-18 11:22:57 -0700 |
| commit | a439334b6e758d38501e225e2e5d0ab73e2fb6eb (patch) | |
| tree | 8f2919ed2f6dcae5c4d5dbaaf608b5c6d248f2fc /bench/DashBench.cpp | |
| parent | 0be9e806af72b3e029e691eef5c891c90d3fd320 (diff) | |
Reland of "switch patheffects over to sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1813553005/ )"
This reverts commit f28ad894272018fd2855e3f77ea1236ea0cce1c0.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1813123003
TBR=
Review URL: https://codereview.chromium.org/1813123003
Diffstat (limited to 'bench/DashBench.cpp')
| -rw-r--r-- | bench/DashBench.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp index e3d8364013..43db54c092 100644 --- a/bench/DashBench.cpp +++ b/bench/DashBench.cpp @@ -72,9 +72,7 @@ protected: SkPath path; this->makePath(&path); - SkAutoTUnref<SkPathEffect> effect(SkDashPathEffect::Create(fIntervals.begin(), - fIntervals.count(), 0)); - paint.setPathEffect(effect); + paint.setPathEffect(SkDashPathEffect::Make(fIntervals.begin(), fIntervals.count(), 0)); if (fDoClip) { SkRect r = path.getBounds(); @@ -179,7 +177,7 @@ static void make_cubic(SkPath* path) { class MakeDashBench : public Benchmark { SkString fName; SkPath fPath; - SkAutoTUnref<SkPathEffect> fPE; + sk_sp<SkPathEffect> fPE; public: MakeDashBench(void (*proc)(SkPath*), const char name[]) { @@ -187,7 +185,7 @@ public: proc(&fPath); SkScalar vals[] = { SkIntToScalar(4), SkIntToScalar(4) }; - fPE.reset(SkDashPathEffect::Create(vals, 2, 0)); + fPE = SkDashPathEffect::Make(vals, 2, 0); } protected: @@ -216,7 +214,7 @@ class DashLineBench : public Benchmark { SkString fName; SkScalar fStrokeWidth; bool fIsRound; - SkAutoTUnref<SkPathEffect> fPE; + sk_sp<SkPathEffect> fPE; public: DashLineBench(SkScalar width, bool isRound) { @@ -225,7 +223,7 @@ public: fIsRound = isRound; SkScalar vals[] = { SK_Scalar1, SK_Scalar1 }; - fPE.reset(SkDashPathEffect::Create(vals, 2, 0)); + fPE = SkDashPathEffect::Make(vals, 2, 0); } protected: @@ -254,7 +252,7 @@ class DrawPointsDashingBench : public Benchmark { int fStrokeWidth; bool fDoAA; - SkAutoTUnref<SkPathEffect> fPathEffect; + sk_sp<SkPathEffect> fPathEffect; public: DrawPointsDashingBench(int dashLength, int strokeWidth, bool doAA) @@ -264,7 +262,7 @@ public: fDoAA = doAA; SkScalar vals[] = { SkIntToScalar(dashLength), SkIntToScalar(dashLength) }; - fPathEffect.reset(SkDashPathEffect::Create(vals, 2, SK_Scalar1)); + fPathEffect = SkDashPathEffect::Make(vals, 2, SK_Scalar1); } protected: @@ -301,7 +299,7 @@ class GiantDashBench : public Benchmark { SkString fName; SkScalar fStrokeWidth; SkPoint fPts[2]; - SkAutoTUnref<SkPathEffect> fPathEffect; + sk_sp<SkPathEffect> fPathEffect; public: enum LineType { @@ -324,8 +322,7 @@ public: // deliberately pick intervals that won't be caught by asPoints(), so // we can test the filterPath code-path. const SkScalar intervals[] = { 20, 10, 10, 10 }; - fPathEffect.reset(SkDashPathEffect::Create(intervals, - SK_ARRAY_COUNT(intervals), 0)); + fPathEffect = SkDashPathEffect::Make(intervals, SK_ARRAY_COUNT(intervals), 0); SkScalar cx = 640 / 2; // center X SkScalar cy = 480 / 2; // center Y @@ -381,7 +378,7 @@ class DashGridBench : public Benchmark { int fStrokeWidth; bool fDoAA; - SkAutoTUnref<SkPathEffect> fPathEffect; + sk_sp<SkPathEffect> fPathEffect; public: DashGridBench(int dashLength, int strokeWidth, bool doAA) { @@ -390,7 +387,7 @@ public: fDoAA = doAA; SkScalar vals[] = { SkIntToScalar(dashLength), SkIntToScalar(dashLength) }; - fPathEffect.reset(SkDashPathEffect::Create(vals, 2, SK_Scalar1)); + fPathEffect = SkDashPathEffect::Make(vals, 2, SK_Scalar1); } protected: |