| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkPath_DEFINED | 8 #ifndef SkPath_DEFINED |
| 9 #define SkPath_DEFINED | 9 #define SkPath_DEFINED |
| 10 | 10 |
| (...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 kDirection_SerializationShift = 26, // requires 2 bits | 1068 kDirection_SerializationShift = 26, // requires 2 bits |
| 1069 kIsVolatile_SerializationShift = 25, // requires 1 bit | 1069 kIsVolatile_SerializationShift = 25, // requires 1 bit |
| 1070 // 1 free bit at 24 | 1070 // 1 free bit at 24 |
| 1071 kConvexity_SerializationShift = 16, // requires 8 bits | 1071 kConvexity_SerializationShift = 16, // requires 8 bits |
| 1072 kFillType_SerializationShift = 8, // requires 8 bits | 1072 kFillType_SerializationShift = 8, // requires 8 bits |
| 1073 // low-8-bits are version | 1073 // low-8-bits are version |
| 1074 }; | 1074 }; |
| 1075 | 1075 |
| 1076 enum SerializationVersions { | 1076 enum SerializationVersions { |
| 1077 kPathPrivFirstDirection_Version = 1, | 1077 kPathPrivFirstDirection_Version = 1, |
| 1078 | 1078 kPathPrivLastMoveToIndex_Version = 2, |
| 1079 kCurrent_Version = 1 | 1079 kCurrent_Version = 2 |
| 1080 }; | 1080 }; |
| 1081 | 1081 |
| 1082 SkAutoTUnref<SkPathRef> fPathRef; | 1082 SkAutoTUnref<SkPathRef> fPathRef; |
| 1083 int fLastMoveToIndex; | 1083 int fLastMoveToIndex; |
| 1084 uint8_t fFillType; | 1084 uint8_t fFillType; |
| 1085 mutable uint8_t fConvexity; | 1085 mutable uint8_t fConvexity; |
| 1086 mutable SkAtomic<uint8_t, sk_memory_order_relaxed> fFirstDirection;// SkPath
Priv::FirstDirection | 1086 mutable SkAtomic<uint8_t, sk_memory_order_relaxed> fFirstDirection;// SkPath
Priv::FirstDirection |
| 1087 mutable SkBool8 fIsVolatile; | 1087 mutable SkBool8 fIsVolatile; |
| 1088 | 1088 |
| 1089 /** Resets all fields other than fPathRef to their initial 'empty' values. | 1089 /** Resets all fields other than fPathRef to their initial 'empty' values. |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 | 1143 |
| 1144 friend class SkAutoPathBoundsUpdate; | 1144 friend class SkAutoPathBoundsUpdate; |
| 1145 friend class SkAutoDisableOvalCheck; | 1145 friend class SkAutoDisableOvalCheck; |
| 1146 friend class SkAutoDisableDirectionCheck; | 1146 friend class SkAutoDisableDirectionCheck; |
| 1147 friend class SkBench_AddPathTest; // perf test reversePathTo | 1147 friend class SkBench_AddPathTest; // perf test reversePathTo |
| 1148 friend class PathTest_Private; // unit test reversePathTo | 1148 friend class PathTest_Private; // unit test reversePathTo |
| 1149 friend class ForceIsRRect_Private; // unit test isRRect | 1149 friend class ForceIsRRect_Private; // unit test isRRect |
| 1150 }; | 1150 }; |
| 1151 | 1151 |
| 1152 #endif | 1152 #endif |
| OLD | NEW |