Index: include/core/SkPathRef.h |
diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h |
index 4b57fc80e4c39fe595e9a7275ce282584818b02e..78c6cd5af73eb48d397c43c4a1cf90ec21559506 100644 |
--- a/include/core/SkPathRef.h |
+++ b/include/core/SkPathRef.h |
@@ -9,7 +9,6 @@ |
#ifndef SkPathRef_DEFINED |
#define SkPathRef_DEFINED |
-#include "SkDynamicAnnotations.h" |
#include "SkMatrix.h" |
#include "SkPoint.h" |
#include "SkRect.h" |
@@ -293,9 +292,9 @@ private: |
SkDEBUGCODE(this->validate();) |
// TODO(mtklein): remove fBoundsIsDirty and fIsFinite, |
// using an inverted rect instead of fBoundsIsDirty and always recalculating fIsFinite. |
- //SkASSERT(fBoundsIsDirty); |
+ SkASSERT(fBoundsIsDirty); |
- fIsFinite = ComputePtBounds(fBounds.get(), *this); |
+ fIsFinite = ComputePtBounds(&fBounds, *this); |
fBoundsIsDirty = false; |
} |
@@ -303,7 +302,7 @@ private: |
SkASSERT(rect.fLeft <= rect.fRight && rect.fTop <= rect.fBottom); |
fBounds = rect; |
fBoundsIsDirty = false; |
- fIsFinite = fBounds->isFinite(); |
+ fIsFinite = fBounds.isFinite(); |
} |
/** Makes additional room but does not change the counts or change the genID */ |
@@ -435,9 +434,9 @@ private: |
kMinSize = 256, |
}; |
- mutable SkTRacyReffable<SkRect> fBounds; |
- mutable SkTRacy<uint8_t> fBoundsIsDirty; |
- mutable SkTRacy<SkBool8> fIsFinite; // only meaningful if bounds are valid |
+ mutable SkRect fBounds; |
+ mutable uint8_t fBoundsIsDirty; |
+ mutable SkBool8 fIsFinite; // only meaningful if bounds are valid |
SkBool8 fIsOval; |
uint8_t fSegmentMask; |