aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2018-07-19 13:47:44 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-19 18:15:16 +0000
commit310f44d3d5298becdd8ab235af29789f6ed769b5 (patch)
tree4ffe4af943672711a1d78e59f9c79bc92a72e8b7 /include
parent8c172ba397087850e9c4949a42ae558ebc6fdaf4 (diff)
rename to Merge patheffect
Bug: skia: Change-Id: Ieca0e71bc0ee6ce33f4f14605fe60d1fc61044ad Reviewed-on: https://skia-review.googlesource.com/142509 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/effects/SkOpPathEffect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/effects/SkOpPathEffect.h b/include/effects/SkOpPathEffect.h
index 54b177ea17..87080fc71f 100644
--- a/include/effects/SkOpPathEffect.h
+++ b/include/effects/SkOpPathEffect.h
@@ -12,7 +12,7 @@
#include "SkPaint.h"
#include "SkPathOps.h"
-class SkOpPathEffect {
+class SkMergePathEffect {
public:
/* Defers to two other patheffects, and then combines their outputs using the specified op.
* e.g.