Remove SkBool8.
This typedef was created at a time when compilers often used sizeof(int)
storage for a bool. This is no longer the case and in all compilers
currently supported 'sizeof(bool) == 1'. Removing this also revealed one
field which was actually not a bool but a tri-state enum.
Change-Id: I9240ba457335ee3eff094d6d3f2520c1adf16960
Reviewed-on: https://skia-review.googlesource.com/134420
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 605454b..e38d736 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -202,9 +202,9 @@
void SkPath::swap(SkPath& that) {
if (this != &that) {
fPathRef.swap(that.fPathRef);
- SkTSwap<int>(fLastMoveToIndex, that.fLastMoveToIndex);
- SkTSwap<uint8_t>(fFillType, that.fFillType);
- SkTSwap<SkBool8>(fIsVolatile, that.fIsVolatile);
+ SkTSwap(fLastMoveToIndex, that.fLastMoveToIndex);
+ SkTSwap(fFillType, that.fFillType);
+ SkTSwap(fIsVolatile, that.fIsVolatile);
// Non-atomic swaps of atomic values.
Convexity c = fConvexity.load();
@@ -1821,15 +1821,6 @@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-enum SegmentState {
- kEmptyContour_SegmentState, // The current contour is empty. We may be
- // starting processing or we may have just
- // closed a contour.
- kAfterMove_SegmentState, // We have seen a move, but nothing else.
- kAfterPrimitive_SegmentState // We have seen a primitive but not yet
- // closed the path. Also the initial state.
-};
-
SkPath::Iter::Iter() {
#ifdef SK_DEBUG
fPts = nullptr;
@@ -1918,11 +1909,11 @@
// Set the first return pt to the move pt
fSegmentState = kAfterPrimitive_SegmentState;
return fMoveTo;
- } else {
- SkASSERT(fSegmentState == kAfterPrimitive_SegmentState);
- // Set the first return pt to the last pt of the previous primitive.
- return fPts[-1];
}
+
+ SkASSERT(fSegmentState == kAfterPrimitive_SegmentState);
+ // Set the first return pt to the last pt of the previous primitive.
+ return fPts[-1];
}
void SkPath::Iter::consumeDegenerateSegments(bool exact) {