| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2007 The Android Open Source Project | 3 * Copyright 2007 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPicture_DEFINED | 10 #ifndef SkPicture_DEFINED |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 // V23: SkPaint::FilterLevel became a real enum | 235 // V23: SkPaint::FilterLevel became a real enum |
| 236 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin
g | 236 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin
g |
| 237 // V25: SkDashPathEffect now only writes phase and interval array when flatt
ening | 237 // V25: SkDashPathEffect now only writes phase and interval array when flatt
ening |
| 238 // V26: Removed boolean from SkColorShader for inheriting color from SkPaint
. | 238 // V26: Removed boolean from SkColorShader for inheriting color from SkPaint
. |
| 239 // V27: Remove SkUnitMapper from gradients (and skia). | 239 // V27: Remove SkUnitMapper from gradients (and skia). |
| 240 // V28: No longer call bitmap::flatten inside SkWriteBuffer::writeBitmap. | 240 // V28: No longer call bitmap::flatten inside SkWriteBuffer::writeBitmap. |
| 241 // V29: Removed SaveFlags parameter from save(). | 241 // V29: Removed SaveFlags parameter from save(). |
| 242 // V30: Remove redundant SkMatrix from SkLocalMatrixShader. | 242 // V30: Remove redundant SkMatrix from SkLocalMatrixShader. |
| 243 // V31: Add a serialized UniqueID to SkImageFilter. | 243 // V31: Add a serialized UniqueID to SkImageFilter. |
| 244 // V32: Removed SkPaintOptionsAndroid from SkPaint | 244 // V32: Removed SkPaintOptionsAndroid from SkPaint |
| 245 // V33: Serialize only public API of effects. |
| 246 // V34: Add SkTextBlob serialization. |
| 245 | 247 |
| 246 // Note: If the picture version needs to be increased then please follow the | 248 // Note: If the picture version needs to be increased then please follow the |
| 247 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw | 249 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw |
| 248 | 250 |
| 249 // Only SKPs within the min/current picture version range (inclusive) can be
read. | 251 // Only SKPs within the min/current picture version range (inclusive) can be
read. |
| 250 static const uint32_t MIN_PICTURE_VERSION = 19; | 252 static const uint32_t MIN_PICTURE_VERSION = 19; |
| 251 static const uint32_t CURRENT_PICTURE_VERSION = 33; | 253 static const uint32_t CURRENT_PICTURE_VERSION = 34; |
| 252 | 254 |
| 253 mutable uint32_t fUniqueID; | 255 mutable uint32_t fUniqueID; |
| 254 | 256 |
| 255 // TODO: make SkPictureData const when clone method goes away | 257 // TODO: make SkPictureData const when clone method goes away |
| 256 SkAutoTDelete<SkPictureData> fData; | 258 SkAutoTDelete<SkPictureData> fData; |
| 257 int fWidth, fHeight; | 259 int fWidth, fHeight; |
| 258 mutable SkAutoTUnref<const AccelData> fAccelData; | 260 mutable SkAutoTUnref<const AccelData> fAccelData; |
| 259 | 261 |
| 260 mutable SkTDArray<DeletionListener*> fDeletionListeners; // pointers are re
fed | 262 mutable SkTDArray<DeletionListener*> fDeletionListeners; // pointers are re
fed |
| 261 | 263 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 bool fWillPlaybackBitmaps; | 321 bool fWillPlaybackBitmaps; |
| 320 bool fHasText; | 322 bool fHasText; |
| 321 int fNumPaintWithPathEffectUses; | 323 int fNumPaintWithPathEffectUses; |
| 322 int fNumFastPathDashEffects; | 324 int fNumFastPathDashEffects; |
| 323 int fNumAAConcavePaths; | 325 int fNumAAConcavePaths; |
| 324 int fNumAAHairlineConcavePaths; | 326 int fNumAAHairlineConcavePaths; |
| 325 } fAnalysis; | 327 } fAnalysis; |
| 326 }; | 328 }; |
| 327 | 329 |
| 328 #endif | 330 #endif |
| OLD | NEW |