Chromium Code Reviews| Index: src/core/SkPath.cpp |
| diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp |
| index 06f8b7e259f44bbd33f2a06b9dc3ea1253572ee1..e01c4d28e8f8a7477a336253bbf208a927ba4bc1 100644 |
| --- a/src/core/SkPath.cpp |
| +++ b/src/core/SkPath.cpp |
| @@ -140,6 +140,7 @@ void SkPath::resetFields() { |
| fFillType = kWinding_FillType; |
| fConvexity = kUnknown_Convexity; |
| fDirection = kUnknown_Direction; |
| + fIsVolatile = false; |
|
bsalomon
2014/10/23 17:54:08
I wonder if this is correct. rewind() and reset()
jvanverth1
2014/10/23 20:06:18
Done.
|
| // We don't touch Android's fSourcePath. It's used to track texture garbage collection, so we |
| // don't want to muck with it if it's been set to something non-NULL. |
| @@ -178,6 +179,7 @@ void SkPath::copyFields(const SkPath& that) { |
| fFillType = that.fFillType; |
| fConvexity = that.fConvexity; |
| fDirection = that.fDirection; |
| + fIsVolatile = that.fIsVolatile; |
| } |
| bool operator==(const SkPath& a, const SkPath& b) { |
| @@ -196,6 +198,7 @@ void SkPath::swap(SkPath& that) { |
| SkTSwap<uint8_t>(fFillType, that.fFillType); |
| SkTSwap<uint8_t>(fConvexity, that.fConvexity); |
| SkTSwap<uint8_t>(fDirection, that.fDirection); |
| + SkTSwap<SkBool8>(fIsVolatile, that.fIsVolatile); |
| #ifdef SK_BUILD_FOR_ANDROID |
| SkTSwap<const SkPath*>(fSourcePath, that.fSourcePath); |
| #endif |
| @@ -1606,6 +1609,7 @@ void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const { |
| if (this != dst) { |
| dst->fFillType = fFillType; |
| dst->fConvexity = fConvexity; |
| + dst->fIsVolatile = fIsVolatile; |
| } |
| if (kUnknown_Direction == fDirection) { |
| @@ -1999,6 +2003,7 @@ size_t SkPath::readFromMemory(const void* storage, size_t length) { |
| fConvexity = (packed >> kConvexity_SerializationShift) & 0xFF; |
| fFillType = (packed >> kFillType_SerializationShift) & 0xFF; |
| fDirection = (packed >> kDirection_SerializationShift) & 0x3; |
| + fIsVolatile = false; // ? |
|
bsalomon
2014/10/23 17:54:08
Should we save/restore this?
jvanverth1
2014/10/23 20:06:18
Done.
|
| SkPathRef* pathRef = SkPathRef::CreateFromBuffer(&buffer); |
| size_t sizeRead = 0; |