| Index: include/core/SkMatrix.h
|
| diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
|
| index 84d1a87e959638e8ad9ae909e0b672caf7bc9a63..bfa03de7c5ddc1af83bf9f4e90723c37e1b78bb8 100644
|
| --- a/include/core/SkMatrix.h
|
| +++ b/include/core/SkMatrix.h
|
| @@ -10,6 +10,7 @@
|
| #ifndef SkMatrix_DEFINED
|
| #define SkMatrix_DEFINED
|
|
|
| +#include "SkDynamicAnnotations.h"
|
| #include "SkRect.h"
|
|
|
| class SkString;
|
| @@ -643,7 +644,7 @@ private:
|
| };
|
|
|
| SkScalar fMat[9];
|
| - mutable uint32_t fTypeMask;
|
| + mutable SkTRacy<uint32_t> fTypeMask;
|
|
|
| uint8_t computeTypeMask() const;
|
| uint8_t computePerspectiveTypeMask() const;
|
| @@ -664,7 +665,7 @@ private:
|
| void clearTypeMask(int mask) {
|
| // only allow a valid mask
|
| SkASSERT((mask & kAllMasks) == mask);
|
| - fTypeMask &= ~mask;
|
| + fTypeMask = fTypeMask & ~mask;
|
| }
|
|
|
| TypeMask getPerspectiveTypeMaskOnly() const {
|
|
|