Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: gm/dashcubics.cpp

Issue 1817543002: Revert of switch patheffects over to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/dashcircle.cpp ('k') | gm/dashing.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/dashcubics.cpp
diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp
index 7736f2b47c5ee24f92d1562d6289fab2f5d52463..1773303f0c8d04306e15e25c43ebeb97901d59ed 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) {
« no previous file with comments | « gm/dashcircle.cpp ('k') | gm/dashing.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698