OLD | NEW |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 | 9 |
10 #ifndef SkPath_DEFINED | 10 #ifndef SkPath_DEFINED |
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
919 * of bytes actually read. | 919 * of bytes actually read. |
920 */ | 920 */ |
921 uint32_t readFromMemory(const void* buffer); | 921 uint32_t readFromMemory(const void* buffer); |
922 | 922 |
923 #ifdef SK_BUILD_FOR_ANDROID | 923 #ifdef SK_BUILD_FOR_ANDROID |
924 uint32_t getGenerationID() const; | 924 uint32_t getGenerationID() const; |
925 const SkPath* getSourcePath() const; | 925 const SkPath* getSourcePath() const; |
926 void setSourcePath(const SkPath* path); | 926 void setSourcePath(const SkPath* path); |
927 #endif | 927 #endif |
928 | 928 |
929 uint32_t getHash() const; | |
bsalomon
2013/10/18 13:25:24
We already have a getGenerationID() method that is
Kimmo Kinnunen
2013/10/21 13:40:48
There's the problem that this would be confusing f
| |
930 | |
929 SkDEBUGCODE(void validate() const;) | 931 SkDEBUGCODE(void validate() const;) |
930 | 932 |
931 private: | 933 private: |
932 enum SerializationOffsets { | 934 enum SerializationOffsets { |
933 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O | 935 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O |
934 kNewFormat_SerializationShift = 28, // requires 1 bit | 936 kNewFormat_SerializationShift = 28, // requires 1 bit |
935 #endif | 937 #endif |
936 kDirection_SerializationShift = 26, // requires 2 bits | 938 kDirection_SerializationShift = 26, // requires 2 bits |
937 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O | 939 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O |
938 // rename to kUnused_SerializationShift | 940 // rename to kUnused_SerializationShift |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1016 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O | 1018 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO O |
1017 friend class SkPathRef; // just for SerializationOffsets | 1019 friend class SkPathRef; // just for SerializationOffsets |
1018 #endif | 1020 #endif |
1019 friend class SkAutoPathBoundsUpdate; | 1021 friend class SkAutoPathBoundsUpdate; |
1020 friend class SkAutoDisableOvalCheck; | 1022 friend class SkAutoDisableOvalCheck; |
1021 friend class SkAutoDisableDirectionCheck; | 1023 friend class SkAutoDisableDirectionCheck; |
1022 friend class SkBench_AddPathTest; // perf test pathTo/reversePathTo | 1024 friend class SkBench_AddPathTest; // perf test pathTo/reversePathTo |
1023 }; | 1025 }; |
1024 | 1026 |
1025 #endif | 1027 #endif |
OLD | NEW |