diff options
author | reed <reed@google.com> | 2016-03-18 10:17:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 10:17:27 -0700 |
commit | f28ad894272018fd2855e3f77ea1236ea0cce1c0 (patch) | |
tree | 25dfb6f13e3bbbde1c9d7af7b41ea39b2df78dd4 /gm/dashcubics.cpp | |
parent | 9fbee18f691a0afed1e38a851048ce06063505ed (diff) |
Revert of switch patheffects over to sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1813553005/ )
Reason for revert:
some build breaks, possibly related to paint having to know what a patheffect is
Original issue's description:
> switch patheffects over to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1813553005
>
> Committed: https://skia.googlesource.com/skia/+/9fbee18f691a0afed1e38a851048ce06063505ed
TBR=caryclark@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1817543002
Diffstat (limited to 'gm/dashcubics.cpp')
-rw-r--r-- | gm/dashcubics.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp index 7736f2b47c..1773303f0c 100644 --- a/gm/dashcubics.cpp +++ b/gm/dashcubics.cpp @@ -14,24 +14,26 @@ /* * Inspired by http://code.google.com/p/chromium/issues/detail?id=112145 */ -static void flower(SkCanvas* canvas, const SkPath& path, SkScalar intervals[2], - SkPaint::Join join) { - SkPaint paint; - paint.setAntiAlias(true); - paint.setStyle(SkPaint::kStroke_Style); - paint.setStrokeJoin(join); - paint.setStrokeWidth(42); - canvas->drawPath(path, paint); +static void flower(SkCanvas* canvas, const SkPath& path, + SkScalar intervals[2], SkPaint::Join join) { + SkPathEffect* pe = SkDashPathEffect::Create(intervals, 2, 0); - paint.setColor(SK_ColorRED); - paint.setStrokeWidth(21); - paint.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0)); - canvas->drawPath(path, paint); + SkPaint paint; + paint.setAntiAlias(true); + paint.setStyle(SkPaint::kStroke_Style); + paint.setStrokeJoin(join); + paint.setStrokeWidth(42); + canvas->drawPath(path, paint); - paint.setColor(SK_ColorGREEN); - paint.setPathEffect(nullptr); - paint.setStrokeWidth(0); - canvas->drawPath(path, paint); + paint.setColor(SK_ColorRED); + paint.setStrokeWidth(21); + paint.setPathEffect(pe)->unref(); + canvas->drawPath(path, paint); + + paint.setColor(SK_ColorGREEN); + paint.setPathEffect(nullptr); + paint.setStrokeWidth(0); + canvas->drawPath(path, paint); } DEF_SIMPLE_GM(dashcubics, canvas, 860, 700) { |