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