From 310f44d3d5298becdd8ab235af29789f6ed769b5 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Thu, 19 Jul 2018 13:47:44 -0400
Subject: 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>
---
 include/effects/SkOpPathEffect.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

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.
-- 
cgit v1.2.3