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

Unified Diff: src/pathops/SkOpContour.cpp

Issue 75453003: optimize pathops coverage (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: remove unused code now that testing is complete Created 7 years, 1 month 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
Index: src/pathops/SkOpContour.cpp
diff --git a/src/pathops/SkOpContour.cpp b/src/pathops/SkOpContour.cpp
index 5feef79801aa267d76f11328e1b4bdaacafdaf7a..874de381b199df57a957276a56cb0d2bc0a52764 100644
--- a/src/pathops/SkOpContour.cpp
+++ b/src/pathops/SkOpContour.cpp
@@ -212,20 +212,17 @@ void SkOpContour::joinCoincidence(const SkTArray<SkCoincidence, true>& coinciden
if (partial ? startT != 0 || oMatchStart != 0 : (startT == 0) != (oMatchStart == 0)) {
bool added = false;
if (oMatchStart != 0) {
- added = thisOne.joinCoincidence(false, &other, oMatchStart, oStep, cancel);
+ added = thisOne.joinCoincidence(&other, oMatchStart, oStep, cancel);
}
- if (startT != 0 && !added) {
- (void) other.joinCoincidence(cancel, &thisOne, startT, step, cancel);
+ if (!cancel && startT != 0 && !added) {
+ (void) other.joinCoincidence(&thisOne, startT, step, cancel);
}
}
double oMatchEnd = cancel ? oStartT : oEndT;
if (partial ? endT != 1 || oMatchEnd != 1 : (endT == 1) != (oMatchEnd == 1)) {
bool added = false;
- if (oMatchEnd != 1) {
- added = thisOne.joinCoincidence(true, &other, oMatchEnd, -oStep, cancel);
- }
- if (endT != 1 && !added) {
- (void) other.joinCoincidence(!cancel, &thisOne, endT, -step, cancel);
+ if (cancel && endT != 1 && !added) {
+ (void) other.joinCoincidence(&thisOne, endT, -step, cancel);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698