| 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 |
| (...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1129 } | 1129 } |
| 1130 | 1130 |
| 1131 friend class SkAutoGlyphCache; | 1131 friend class SkAutoGlyphCache; |
| 1132 friend class SkAutoGlyphCacheNoGamma; | 1132 friend class SkAutoGlyphCacheNoGamma; |
| 1133 friend class SkCanvas; | 1133 friend class SkCanvas; |
| 1134 friend class SkDraw; | 1134 friend class SkDraw; |
| 1135 friend class SkGraphics; // So Term() can be called. | 1135 friend class SkGraphics; // So Term() can be called. |
| 1136 friend class SkPDFDevice; | 1136 friend class SkPDFDevice; |
| 1137 friend class GrBitmapTextContext; | 1137 friend class GrBitmapTextContext; |
| 1138 friend class GrDistanceFieldTextContext; | 1138 friend class GrDistanceFieldTextContext; |
| 1139 friend class GrStencilAndCoverTextContext; |
| 1139 friend class SkTextToPathIter; | 1140 friend class SkTextToPathIter; |
| 1140 friend class SkCanonicalizePaint; | 1141 friend class SkCanonicalizePaint; |
| 1141 | 1142 |
| 1142 #ifdef SK_BUILD_FOR_ANDROID | 1143 #ifdef SK_BUILD_FOR_ANDROID |
| 1143 SkPaintOptionsAndroid fPaintOptionsAndroid; | 1144 SkPaintOptionsAndroid fPaintOptionsAndroid; |
| 1144 | 1145 |
| 1145 // In order for the == operator to work properly this must be the last field | 1146 // In order for the == operator to work properly this must be the last field |
| 1146 // in the struct so that we can do a memcmp to this field's offset. | 1147 // in the struct so that we can do a memcmp to this field's offset. |
| 1147 uint32_t fGenerationID; | 1148 uint32_t fGenerationID; |
| 1148 #endif | 1149 #endif |
| 1149 }; | 1150 }; |
| 1150 | 1151 |
| 1151 #endif | 1152 #endif |
| OLD | NEW |