| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 232     // V12: add conics to SkPath, use new SkPathRef flattening | 232     // V12: add conics to SkPath, use new SkPathRef flattening | 
| 233     // V13: add flag to drawBitmapRectToRect | 233     // V13: add flag to drawBitmapRectToRect | 
| 234     //      parameterize blurs by sigma rather than radius | 234     //      parameterize blurs by sigma rather than radius | 
| 235     // V14: Add flags word to PathRef serialization | 235     // V14: Add flags word to PathRef serialization | 
| 236     // V15: Remove A1 bitmpa config (and renumber remaining configs) | 236     // V15: Remove A1 bitmpa config (and renumber remaining configs) | 
| 237     // V16: Move SkPath's isOval flag to SkPathRef | 237     // V16: Move SkPath's isOval flag to SkPathRef | 
| 238     // V17: SkPixelRef now writes SkImageInfo | 238     // V17: SkPixelRef now writes SkImageInfo | 
| 239     // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. | 239     // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. | 
| 240     // V19: encode matrices and regions into the ops stream | 240     // V19: encode matrices and regions into the ops stream | 
| 241     // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
     re serialization) | 241     // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu
     re serialization) | 
|  | 242     // V21: add pushCull, popCull | 
| 242 | 243 | 
| 243     // Note: If the picture version needs to be increased then please follow the | 244     // Note: If the picture version needs to be increased then please follow the | 
| 244     // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
     l/qATVcw | 245     // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
     l/qATVcw | 
| 245 | 246 | 
| 246     // Only SKPs within the min/current picture version range (inclusive) can be
      read. | 247     // Only SKPs within the min/current picture version range (inclusive) can be
      read. | 
| 247     static const uint32_t MIN_PICTURE_VERSION = 19; | 248     static const uint32_t MIN_PICTURE_VERSION = 19; | 
| 248     static const uint32_t CURRENT_PICTURE_VERSION = 20; | 249     static const uint32_t CURRENT_PICTURE_VERSION = 21; | 
| 249 | 250 | 
| 250     // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
     es to | 251     // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class
     es to | 
| 251     // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
     ed | 252     // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv
     ed | 
| 252     // recorders and set the picture size | 253     // recorders and set the picture size | 
| 253     SkPicturePlayback* fPlayback; | 254     SkPicturePlayback* fPlayback; | 
| 254     SkPictureRecord* fRecord; | 255     SkPictureRecord* fRecord; | 
| 255     int fWidth, fHeight; | 256     int fWidth, fHeight; | 
| 256 | 257 | 
| 257     // Create a new SkPicture from an existing SkPicturePlayback. Ref count of | 258     // Create a new SkPicture from an existing SkPicturePlayback. Ref count of | 
| 258     // playback is unchanged. | 259     // playback is unchanged. | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 289  */ | 290  */ | 
| 290 class SK_API SkDrawPictureCallback { | 291 class SK_API SkDrawPictureCallback { | 
| 291 public: | 292 public: | 
| 292     SkDrawPictureCallback() {} | 293     SkDrawPictureCallback() {} | 
| 293     virtual ~SkDrawPictureCallback() {} | 294     virtual ~SkDrawPictureCallback() {} | 
| 294 | 295 | 
| 295     virtual bool abortDrawing() = 0; | 296     virtual bool abortDrawing() = 0; | 
| 296 }; | 297 }; | 
| 297 | 298 | 
| 298 #endif | 299 #endif | 
| OLD | NEW | 
|---|