| 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 // V14: Add flags word to PathRef serialization | 303 // V14: Add flags word to PathRef serialization |
| 304 // V15: Remove A1 bitmap config (and renumber remaining configs) | 304 // V15: Remove A1 bitmap config (and renumber remaining configs) |
| 305 // V16: Move SkPath's isOval flag to SkPathRef | 305 // V16: Move SkPath's isOval flag to SkPathRef |
| 306 // V17: SkPixelRef now writes SkImageInfo | 306 // V17: SkPixelRef now writes SkImageInfo |
| 307 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. | 307 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. |
| 308 // V19: encode matrices and regions into the ops stream | 308 // V19: encode matrices and regions into the ops stream |
| 309 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
re serialization) | 309 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
re serialization) |
| 310 // V21: add pushCull, popCull | 310 // V21: add pushCull, popCull |
| 311 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes | 311 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes |
| 312 // V23: SkPaint::FilterLevel became a real enum | 312 // V23: SkPaint::FilterLevel became a real enum |
| 313 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin
g |
| 313 | 314 |
| 314 // Note: If the picture version needs to be increased then please follow the | 315 // Note: If the picture version needs to be increased then please follow the |
| 315 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw | 316 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw |
| 316 | 317 |
| 317 // Only SKPs within the min/current picture version range (inclusive) can be
read. | 318 // Only SKPs within the min/current picture version range (inclusive) can be
read. |
| 318 static const uint32_t MIN_PICTURE_VERSION = 19; | 319 static const uint32_t MIN_PICTURE_VERSION = 19; |
| 319 static const uint32_t CURRENT_PICTURE_VERSION = 23; | 320 static const uint32_t CURRENT_PICTURE_VERSION = 24; |
| 320 | 321 |
| 321 mutable uint32_t fUniqueID; | 322 mutable uint32_t fUniqueID; |
| 322 | 323 |
| 323 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
es to | 324 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
es to |
| 324 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
ed | 325 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
ed |
| 325 // recorders and set the picture size | 326 // recorders and set the picture size |
| 326 SkPicturePlayback* fPlayback; | 327 SkPicturePlayback* fPlayback; |
| 327 SkPictureRecord* fRecord; | 328 SkPictureRecord* fRecord; |
| 328 int fWidth, fHeight; | 329 int fWidth, fHeight; |
| 329 const AccelData* fAccelData; | 330 const AccelData* fAccelData; |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 } | 472 } |
| 472 | 473 |
| 473 private: | 474 private: |
| 474 SkAutoTUnref<SkPictureFactory> fFactory; | 475 SkAutoTUnref<SkPictureFactory> fFactory; |
| 475 SkAutoTUnref<SkPicture> fPicture; | 476 SkAutoTUnref<SkPicture> fPicture; |
| 476 | 477 |
| 477 typedef SkNoncopyable INHERITED; | 478 typedef SkNoncopyable INHERITED; |
| 478 }; | 479 }; |
| 479 | 480 |
| 480 #endif | 481 #endif |
| OLD | NEW |