diff options
| author |  Mike Reed <reed@google.com> | 2018-07-19 13:47:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 18:15:16 +0000 |
| commit | 310f44d3d5298becdd8ab235af29789f6ed769b5 (patch) | |
| tree | 4ffe4af943672711a1d78e59f9c79bc92a72e8b7 | |
| parent | 8c172ba397087850e9c4949a42ae558ebc6fdaf4 (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>
| -rw-r--r-- | gm/patheffects.cpp | 14 | ||||
| -rw-r--r-- | include/effects/SkOpPathEffect.h | 2 | ||||
| -rw-r--r-- | src/effects/SkOpPathEffect.cpp | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp index 0f600c4fb5..aba51155bb 100644 --- a/gm/patheffects.cpp +++ b/gm/patheffects.cpp @@ -189,12 +189,14 @@ protected: sk_sp<SkPathEffect> effects[] = { nullptr, SkStrokePathEffect::Make(20, SkPaint::kRound_Join, SkPaint::kRound_Cap, 0), - SkOpPathEffect::Make(nullptr, - SkStrokePathEffect::Make(20, SkPaint::kRound_Join, SkPaint::kRound_Cap, 0), - kDifference_SkPathOp), - SkOpPathEffect::Make(SkMatrixPathEffect::MakeTranslate(50, 30), - SkStrokePathEffect::Make(20, SkPaint::kRound_Join, SkPaint::kRound_Cap, 0), - kReverseDifference_SkPathOp), + SkMergePathEffect::Make(nullptr, + SkStrokePathEffect::Make(20, SkPaint::kRound_Join, + SkPaint::kRound_Cap, 0), + kDifference_SkPathOp), + SkMergePathEffect::Make(SkMatrixPathEffect::MakeTranslate(50, 30), + SkStrokePathEffect::Make(20, SkPaint::kRound_Join, + SkPaint::kRound_Cap, 0), + kReverseDifference_SkPathOp), }; SkPaint wireframe; 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. 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; } ////////////////////////////////////////////////////////////////////////////////////////////////// |