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 /gm | |
| 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>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/patheffects.cpp | 14 |
1 files changed, 8 insertions, 6 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; |