Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: src/pathops/SkOpCoincidence.cpp

Issue 2275703003: remove point aliases (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/pathops/SkAddIntersections.cpp ('k') | src/pathops/SkOpSegment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpCoincidence.cpp
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp
index ea84e04e01e91b391c7f13d5ff94ae91b02fb30c..84c4003968030da5f7d2145c417aa7f5cb1160d1 100755
--- a/src/pathops/SkOpCoincidence.cpp
+++ b/src/pathops/SkOpCoincidence.cpp
@@ -305,7 +305,7 @@ bool SkOpCoincidence::addEndMovedSpans(const SkOpSpan* base, const SkOpSpanBase*
continue;
}
SkOpSegment* writableSeg = const_cast<SkOpSegment*>(testSeg);
- SkOpPtT* oppStart = writableSeg->addT(t, SkOpSegment::kAllowAliasMatch, nullptr);
+ SkOpPtT* oppStart = writableSeg->addT(t, nullptr);
SkOpSpan* writableBase = const_cast<SkOpSpan*>(base);
oppStart->span()->addOppAndMerge(writableBase);
if (oppStart->deleted()) {
@@ -691,9 +691,9 @@ bool SkOpCoincidence::addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg,
this->debugValidate();
if (!cs || !os) {
SkOpPtT* csWritable = cs ? const_cast<SkOpPtT*>(cs)
- : coinSeg->addT(coinTs, SkOpSegment::kNoAliasMatch, nullptr);
+ : coinSeg->addT(coinTs, nullptr);
SkOpPtT* osWritable = os ? const_cast<SkOpPtT*>(os)
- : oppSeg->addT(oppTs, SkOpSegment::kNoAliasMatch, nullptr);
+ : oppSeg->addT(oppTs, nullptr);
if (!csWritable || !osWritable) {
return false;
}
@@ -706,9 +706,9 @@ bool SkOpCoincidence::addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg,
}
if (!ce || !oe) {
SkOpPtT* ceWritable = ce ? const_cast<SkOpPtT*>(ce)
- : coinSeg->addT(coinTe, SkOpSegment::kNoAliasMatch, nullptr);
+ : coinSeg->addT(coinTe, nullptr);
SkOpPtT* oeWritable = oe ? const_cast<SkOpPtT*>(oe)
- : oppSeg->addT(oppTe, SkOpSegment::kNoAliasMatch, nullptr);
+ : oppSeg->addT(oppTe, nullptr);
ceWritable->span()->addOppAndMerge(oeWritable->span());
ce = ceWritable;
oe = oeWritable;
« no previous file with comments | « src/pathops/SkAddIntersections.cpp ('k') | src/pathops/SkOpSegment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698