From 310f44d3d5298becdd8ab235af29789f6ed769b5 Mon Sep 17 00:00:00 2001 From: Mike Reed 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 Commit-Queue: Mike Reed --- src/effects/SkOpPathEffect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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 SkOpPathEffect::Make(sk_sp one, sk_sp two, - SkPathOp op) { +sk_sp SkMergePathEffect::Make(sk_sp one, sk_sp two, + SkPathOp op) { return sk_sp(new SkOpPE(std::move(one), std::move(two), op)); } @@ -48,7 +48,7 @@ sk_sp 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; } ////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3