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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/effects/SkOpPathEffect.cpp b/src/effects/SkOpPathEffect.cpp
index 4f23ab8583..3c09b9e38b 100644
--- a/src/effects/SkOpPathEffect.cpp
+++ b/src/effects/SkOpPathEffect.cpp
@@ -10,8 +10,8 @@
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
-sk_sp<SkPathEffect> SkOpPathEffect::Make(sk_sp<SkPathEffect> one, sk_sp<SkPathEffect> two,
-                                         SkPathOp op) {
+sk_sp<SkPathEffect> SkMergePathEffect::Make(sk_sp<SkPathEffect> one, sk_sp<SkPathEffect> two,
+                                            SkPathOp op) {
     return sk_sp<SkPathEffect>(new SkOpPE(std::move(one), std::move(two), op));
 }
 
@@ -48,7 +48,7 @@ sk_sp<SkFlattenable> SkOpPE::CreateProc(SkReadBuffer& buffer) {
     auto one = buffer.readPathEffect();
     auto two = buffer.readPathEffect();
     SkPathOp op = buffer.read32LE(kReverseDifference_SkPathOp);
-    return buffer.isValid() ? SkOpPathEffect::Make(std::move(one), std::move(two), op) : nullptr;
+    return buffer.isValid() ? SkMergePathEffect::Make(std::move(one), std::move(two), op) : nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////