OLD | NEW |
---|---|
1 | 1 |
2 | 2 |
3 /* | 3 /* |
4 * Copyright 2006 The Android Open Source Project | 4 * Copyright 2006 The Android Open Source Project |
5 * | 5 * |
6 * Use of this source code is governed by a BSD-style license that can be | 6 * Use of this source code is governed by a BSD-style license that can be |
7 * found in the LICENSE file. | 7 * found in the LICENSE file. |
8 */ | 8 */ |
9 | 9 |
10 | 10 |
11 #ifndef SkPaint_DEFINED | 11 #ifndef SkPaint_DEFINED |
12 #define SkPaint_DEFINED | 12 #define SkPaint_DEFINED |
13 | 13 |
14 #include "SkColor.h" | 14 #include "SkColor.h" |
15 #include "SkDrawLooper.h" | 15 #include "SkDrawLooper.h" |
16 #include "SkMatrix.h" | 16 #include "SkMatrix.h" |
17 #include "SkXfermode.h" | 17 #include "SkXfermode.h" |
18 #ifdef SK_BUILD_FOR_ANDROID | 18 #ifdef SK_BUILD_FOR_ANDROID |
19 #include "SkPaintOptionsAndroid.h" | 19 #include "SkPaintOptionsAndroid.h" |
20 #endif | 20 #endif // SK_BUILD_FOR_ANDROID |
djsollen
2013/09/20 12:58:23
in general I wouldn't bother editing this file jus
mtklein
2013/09/20 13:18:46
Agreed. I wasn't looking at the end-to-end diff h
| |
21 | 21 |
22 class SkAnnotation; | 22 class SkAnnotation; |
23 class SkAutoGlyphCache; | 23 class SkAutoGlyphCache; |
24 class SkColorFilter; | 24 class SkColorFilter; |
25 class SkDescriptor; | 25 class SkDescriptor; |
26 struct SkDeviceProperties; | 26 struct SkDeviceProperties; |
27 class SkFlattenableReadBuffer; | 27 class SkFlattenableReadBuffer; |
28 class SkFlattenableWriteBuffer; | 28 class SkFlattenableWriteBuffer; |
29 struct SkGlyph; | 29 struct SkGlyph; |
30 struct SkRect; | 30 struct SkRect; |
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1079 #ifdef SK_BUILD_FOR_ANDROID | 1079 #ifdef SK_BUILD_FOR_ANDROID |
1080 SkPaintOptionsAndroid fPaintOptionsAndroid; | 1080 SkPaintOptionsAndroid fPaintOptionsAndroid; |
1081 | 1081 |
1082 // In order for the == operator to work properly this must be the last field | 1082 // In order for the == operator to work properly this must be the last field |
1083 // in the struct so that we can do a memcmp to this field's offset. | 1083 // in the struct so that we can do a memcmp to this field's offset. |
1084 uint32_t fGenerationID; | 1084 uint32_t fGenerationID; |
1085 #endif | 1085 #endif |
1086 }; | 1086 }; |
1087 | 1087 |
1088 #endif | 1088 #endif |
OLD | NEW |