| 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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 */ | 951 */ |
| 952 uint32_t getGenerationID() const; | 952 uint32_t getGenerationID() const; |
| 953 | 953 |
| 954 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK | 954 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
| 955 static const int kPathRefGenIDBitCnt = 30; // leave room for the fill type (
skbug.com/1762) | 955 static const int kPathRefGenIDBitCnt = 30; // leave room for the fill type (
skbug.com/1762) |
| 956 #else | 956 #else |
| 957 static const int kPathRefGenIDBitCnt = 32; | 957 static const int kPathRefGenIDBitCnt = 32; |
| 958 #endif | 958 #endif |
| 959 | 959 |
| 960 SkDEBUGCODE(void validate() const;) | 960 SkDEBUGCODE(void validate() const;) |
| 961 SkDEBUGCODE(void experimentalValidateRef() const { fPathRef->validate(); } ) |
| 961 | 962 |
| 962 private: | 963 private: |
| 963 enum SerializationOffsets { | 964 enum SerializationOffsets { |
| 964 // 1 free bit at 29 | 965 // 1 free bit at 29 |
| 965 kUnused1_SerializationShift = 28, // 1 free bit | 966 kUnused1_SerializationShift = 28, // 1 free bit |
| 966 kDirection_SerializationShift = 26, // requires 2 bits | 967 kDirection_SerializationShift = 26, // requires 2 bits |
| 967 kIsVolatile_SerializationShift = 25, // requires 1 bit | 968 kIsVolatile_SerializationShift = 25, // requires 1 bit |
| 968 // 1 free bit at 24 | 969 // 1 free bit at 24 |
| 969 kConvexity_SerializationShift = 16, // requires 8 bits | 970 kConvexity_SerializationShift = 16, // requires 8 bits |
| 970 kFillType_SerializationShift = 8, // requires 8 bits | 971 kFillType_SerializationShift = 8, // requires 8 bits |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 } | 1034 } |
| 1034 | 1035 |
| 1035 friend class SkAutoPathBoundsUpdate; | 1036 friend class SkAutoPathBoundsUpdate; |
| 1036 friend class SkAutoDisableOvalCheck; | 1037 friend class SkAutoDisableOvalCheck; |
| 1037 friend class SkAutoDisableDirectionCheck; | 1038 friend class SkAutoDisableDirectionCheck; |
| 1038 friend class SkBench_AddPathTest; // perf test reversePathTo | 1039 friend class SkBench_AddPathTest; // perf test reversePathTo |
| 1039 friend class PathTest_Private; // unit test reversePathTo | 1040 friend class PathTest_Private; // unit test reversePathTo |
| 1040 }; | 1041 }; |
| 1041 | 1042 |
| 1042 #endif | 1043 #endif |
| OLD | NEW |