| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 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 SkValue_DEFINED | 8 #ifndef SkValue_DEFINED |
| 9 #define SkValue_DEFINED | 9 #define SkValue_DEFINED |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 Bytes, S16s, U16s, S32s, U32s, S64s, U64s, F32s, F64s, | 22 Bytes, S16s, U16s, S32s, U32s, S64s, U64s, F32s, F64s, |
| 23 Array, | 23 Array, |
| 24 | 24 |
| 25 kMaxBuiltin = 0xFF, | 25 kMaxBuiltin = 0xFF, |
| 26 // 256-2147483647 may be used by Skia for public Object types. | 26 // 256-2147483647 may be used by Skia for public Object types. |
| 27 | 27 |
| 28 Matrix, | 28 Matrix, |
| 29 | 29 |
| 30 ArithmeticXfermode, | 30 ArithmeticXfermode, |
| 31 DefaultXfermode, | 31 DefaultXfermode, |
| 32 #if SK_INCLUDE_DEPRECATED_XFERMODES |
| 32 PixelXorXfermode, | 33 PixelXorXfermode, |
| 34 #else |
| 35 DeprecatedXfermode, |
| 36 #endif |
| 33 ProcCoeffXfermode, | 37 ProcCoeffXfermode, |
| 34 | 38 |
| 35 kMaxPublicObject = 0x7FFFFFFF, | 39 kMaxPublicObject = 0x7FFFFFFF, |
| 36 // 2147483648+ won't be used by Skia. They're open for | 40 // 2147483648+ won't be used by Skia. They're open for |
| 37 // client-specific use, testing, etc. | 41 // client-specific use, testing, etc. |
| 38 }; | 42 }; |
| 39 | 43 |
| 40 // Each Object type may define its own namespace of Key values, | 44 // Each Object type may define its own namespace of Key values, |
| 41 // so there are no pre-defined Keys here. | 45 // so there are no pre-defined Keys here. |
| 42 // | 46 // |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 || U16s == fType | 111 || U16s == fType |
| 108 || U32s == fType | 112 || U32s == fType |
| 109 || F32s == fType; | 113 || F32s == fType; |
| 110 } | 114 } |
| 111 template <typename T> static SkValue FromT(SkValue::Type, T SkValue::*, T); | 115 template <typename T> static SkValue FromT(SkValue::Type, T SkValue::*, T); |
| 112 template <typename T> static SkValue FromTs(SkValue::Type, SkData*); | 116 template <typename T> static SkValue FromTs(SkValue::Type, SkData*); |
| 113 template <typename T> const T* asTs(SkValue::Type, int*) const; | 117 template <typename T> const T* asTs(SkValue::Type, int*) const; |
| 114 }; | 118 }; |
| 115 | 119 |
| 116 #endif // SkValue_DEFINED | 120 #endif // SkValue_DEFINED |
| OLD | NEW |