| Index: src/core/SkPath.cpp
|
| ===================================================================
|
| --- src/core/SkPath.cpp (revision 12392)
|
| +++ src/core/SkPath.cpp (working copy)
|
| @@ -2084,11 +2084,7 @@
|
| (fConvexity << kConvexity_SerializationShift) |
|
| (fFillType << kFillType_SerializationShift) |
|
| (fSegmentMask << kSegmentMask_SerializationShift) |
|
| - (fDirection << kDirection_SerializationShift)
|
| -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
|
| - | (0x1 << kNewFormat_SerializationShift)
|
| -#endif
|
| - ;
|
| + (fDirection << kDirection_SerializationShift);
|
|
|
| buffer.write32(packed);
|
|
|
| @@ -2111,15 +2107,8 @@
|
| fFillType = (packed >> kFillType_SerializationShift) & 0xFF;
|
| fSegmentMask = (packed >> kSegmentMask_SerializationShift) & 0xF;
|
| fDirection = (packed >> kDirection_SerializationShift) & 0x3;
|
| -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
|
| - bool newFormat = (packed >> kNewFormat_SerializationShift) & 1;
|
| -#endif
|
|
|
| - SkPathRef* pathRef = SkPathRef::CreateFromBuffer(&buffer
|
| -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
|
| - , newFormat, packed
|
| -#endif
|
| - );
|
| + SkPathRef* pathRef = SkPathRef::CreateFromBuffer(&buffer);
|
|
|
| size_t sizeRead = 0;
|
| if (buffer.isValid()) {
|
|
|