diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-03 19:46:58 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-03 19:46:58 +0000 |
| commit | 11e055518a0cbe5329232a55fe2cd177e83836d8 (patch) | |
| tree | b3edebfa12a9ad252c11cbea29482c22bdcc6541 /include | |
| parent | f8cb184095946ebf8f183d253e27bd544a19f23c (diff) | |
Code cleanup following recapture of skps
https://codereview.chromium.org/88233003/
git-svn-id: http://skia.googlecode.com/svn/trunk@12472 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPath.h | 11 | ||||
| -rw-r--r-- | include/core/SkPicture.h | 8 |
2 files changed, 4 insertions, 15 deletions
diff --git a/include/core/SkPath.h b/include/core/SkPath.h index 0388739cff..0b2ea61b96 100644 --- a/include/core/SkPath.h +++ b/include/core/SkPath.h @@ -932,16 +932,11 @@ public: private: enum SerializationOffsets { #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO - kNewFormat2_SerializationShift = 29, // requires 1 bit -#endif -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO - kNewFormat_SerializationShift = 28, // requires 1 bit + kNewFormat_SerializationShift = 29, // requires 1 bit #endif + kUnused1_SerializationShift = 28, // 1 free bit kDirection_SerializationShift = 26, // requires 2 bits -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO - // rename to kUnused_SerializationShift - kOldIsFinite_SerializationShift = 25, // 1 bit -#endif + kUnused2_SerializationShift = 25, // 1 free bit #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO kOldIsOval_SerializationShift = 24, // requires 1 bit #endif diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 552a1f9ad5..bce343ec04 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -220,14 +220,8 @@ protected: // V14: Add flags word to PathRef serialization // V15: Remove A1 bitmpa config (and renumber remaining configs) // V16: Move SkPath's isOval flag to SkPathRef -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO - static const uint32_t PRIOR_PRIOR_PICTURE_VERSION = 12; // TODO: remove when .skps regenerated -#endif -#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO - static const uint32_t PRIOR_PICTURE_VERSION2 = 13; // TODO: remove when .skps regenerated -#endif #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO - static const uint32_t PRIOR_PICTURE_VERSION3 = 15; // TODO: remove when .skps regenerated + static const uint32_t PRIOR_PICTURE_VERSION = 15; // TODO: remove when .skps regenerated #endif static const uint32_t PICTURE_VERSION = 16; |