| 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 SkTypes_DEFINED | 8 #ifndef SkTypes_DEFINED |
| 9 #define SkTypes_DEFINED | 9 #define SkTypes_DEFINED |
| 10 | 10 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 #else | 138 #else |
| 139 #define SkDEVCODE(code) | 139 #define SkDEVCODE(code) |
| 140 #endif | 140 #endif |
| 141 | 141 |
| 142 #ifdef SK_IGNORE_TO_STRING | 142 #ifdef SK_IGNORE_TO_STRING |
| 143 #define SK_TO_STRING_NONVIRT() | 143 #define SK_TO_STRING_NONVIRT() |
| 144 #define SK_TO_STRING_VIRT() | 144 #define SK_TO_STRING_VIRT() |
| 145 #define SK_TO_STRING_PUREVIRT() | 145 #define SK_TO_STRING_PUREVIRT() |
| 146 #define SK_TO_STRING_OVERRIDE() | 146 #define SK_TO_STRING_OVERRIDE() |
| 147 #else | 147 #else |
| 148 class SkString; | |
| 149 // the 'toString' helper functions convert Sk* objects to human-readable | 148 // the 'toString' helper functions convert Sk* objects to human-readable |
| 150 // form in developer mode | 149 // form in developer mode |
| 151 #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; | 150 #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; |
| 152 #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; | 151 #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; |
| 153 #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const =
0; | 152 #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const =
0; |
| 154 #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override; | 153 #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override; |
| 155 #endif | 154 #endif |
| 156 | 155 |
| 157 template <bool> | 156 template <bool> |
| 158 struct SkCompileAssert { | 157 struct SkCompileAssert { |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 private: | 681 private: |
| 683 void* fPtr; | 682 void* fPtr; |
| 684 size_t fSize; // can be larger than the requested size (see kReuse) | 683 size_t fSize; // can be larger than the requested size (see kReuse) |
| 685 uint32_t fStorage[(kSize + 3) >> 2]; | 684 uint32_t fStorage[(kSize + 3) >> 2]; |
| 686 }; | 685 }; |
| 687 // Can't guard the constructor because it's a template class. | 686 // Can't guard the constructor because it's a template class. |
| 688 | 687 |
| 689 #endif /* C++ */ | 688 #endif /* C++ */ |
| 690 | 689 |
| 691 #endif | 690 #endif |
| OLD | NEW |