| 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 316     // V14: Add flags word to PathRef serialization | 316     // V14: Add flags word to PathRef serialization | 
| 317     // V15: Remove A1 bitmap config (and renumber remaining configs) | 317     // V15: Remove A1 bitmap config (and renumber remaining configs) | 
| 318     // V16: Move SkPath's isOval flag to SkPathRef | 318     // V16: Move SkPath's isOval flag to SkPathRef | 
| 319     // V17: SkPixelRef now writes SkImageInfo | 319     // V17: SkPixelRef now writes SkImageInfo | 
| 320     // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. | 320     // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. | 
| 321     // V19: encode matrices and regions into the ops stream | 321     // V19: encode matrices and regions into the ops stream | 
| 322     // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
     re serialization) | 322     // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
     re serialization) | 
| 323     // V21: add pushCull, popCull | 323     // V21: add pushCull, popCull | 
| 324     // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes | 324     // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes | 
| 325     // V23: SkPaint::FilterLevel became a real enum | 325     // V23: SkPaint::FilterLevel became a real enum | 
|  | 326     // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin
     g | 
| 326 | 327 | 
| 327     // Note: If the picture version needs to be increased then please follow the | 328     // Note: If the picture version needs to be increased then please follow the | 
| 328     // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
     l/qATVcw | 329     // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
     l/qATVcw | 
| 329 | 330 | 
| 330     // Only SKPs within the min/current picture version range (inclusive) can be
      read. | 331     // Only SKPs within the min/current picture version range (inclusive) can be
      read. | 
| 331     static const uint32_t MIN_PICTURE_VERSION = 19; | 332     static const uint32_t MIN_PICTURE_VERSION = 19; | 
| 332     static const uint32_t CURRENT_PICTURE_VERSION = 23; | 333     static const uint32_t CURRENT_PICTURE_VERSION = 24; | 
| 333 | 334 | 
| 334     mutable uint32_t      fUniqueID; | 335     mutable uint32_t      fUniqueID; | 
| 335 | 336 | 
| 336     // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
     es to | 337     // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
     es to | 
| 337     // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
     ed | 338     // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
     ed | 
| 338     // recorders and set the picture size | 339     // recorders and set the picture size | 
| 339     SkPicturePlayback*    fPlayback; | 340     SkPicturePlayback*    fPlayback; | 
| 340     SkPictureRecord*      fRecord; | 341     SkPictureRecord*      fRecord; | 
| 341     int                   fWidth, fHeight; | 342     int                   fWidth, fHeight; | 
| 342     const AccelData*      fAccelData; | 343     const AccelData*      fAccelData; | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 530 #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES | 531 #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES | 
| 531     SkAutoTUnref<SkPictureFactory>  fFactory; | 532     SkAutoTUnref<SkPictureFactory>  fFactory; | 
| 532 #endif | 533 #endif | 
| 533 | 534 | 
| 534     SkAutoTUnref<SkPicture>         fPicture; | 535     SkAutoTUnref<SkPicture>         fPicture; | 
| 535 | 536 | 
| 536     typedef SkNoncopyable INHERITED; | 537     typedef SkNoncopyable INHERITED; | 
| 537 }; | 538 }; | 
| 538 | 539 | 
| 539 #endif | 540 #endif | 
| OLD | NEW | 
|---|