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

Unified Diff: src/pathops/SkPathOpsTypes.h

Issue 1140383002: fix builder winding again (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 7 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/SkPathOpsDebug.cpp ('k') | src/pathops/SkPathOpsWinding.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkPathOpsTypes.h
diff --git a/src/pathops/SkPathOpsTypes.h b/src/pathops/SkPathOpsTypes.h
index a780a88c6de48f773c5ccbcc945d0626dca0d7b2..13ebfee84d0ad15cab547741f98c5eff5a2ae500 100644
--- a/src/pathops/SkPathOpsTypes.h
+++ b/src/pathops/SkPathOpsTypes.h
@@ -31,6 +31,7 @@ public:
SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head)
: fCoincidence(coincidence)
, fContourHead(head)
+ , fNested(0)
, fWindingFailed(false)
, fAngleCoincidence(false)
, fPhase(kIntersecting)
@@ -55,6 +56,14 @@ public:
return fAngleCoincidence;
}
+ void bumpNested() {
+ ++fNested;
+ }
+
+ void clearNested() {
+ fNested = 0;
+ }
+
SkOpCoincidence* coincidence() {
return fCoincidence;
}
@@ -69,7 +78,13 @@ public:
const class SkOpPtT* debugPtT(int id) const;
const class SkOpSegment* debugSegment(int id) const;
const class SkOpSpanBase* debugSpan(int id) const;
+#endif
+
+ int nested() const {
+ return fNested;
+ }
+#ifdef SK_DEBUG
int nextAngleID() {
return ++fAngleID;
}
@@ -119,6 +134,7 @@ public:
private:
SkOpCoincidence* fCoincidence;
SkOpContourHead* fContourHead;
+ int fNested;
bool fWindingFailed;
bool fAngleCoincidence;
Phase fPhase;
« no previous file with comments | « src/pathops/SkPathOpsDebug.cpp ('k') | src/pathops/SkPathOpsWinding.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698