| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 | 234 |
| 235 // Note: If the picture version needs to be increased then please follow the | 235 // Note: If the picture version needs to be increased then please follow the |
| 236 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw | 236 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g
l/qATVcw |
| 237 | 237 |
| 238 // Only SKPs within the min/current picture version range (inclusive) can be
read. | 238 // Only SKPs within the min/current picture version range (inclusive) can be
read. |
| 239 static const uint32_t MIN_PICTURE_VERSION = 19; | 239 static const uint32_t MIN_PICTURE_VERSION = 19; |
| 240 static const uint32_t CURRENT_PICTURE_VERSION = 29; | 240 static const uint32_t CURRENT_PICTURE_VERSION = 29; |
| 241 | 241 |
| 242 mutable uint32_t fUniqueID; | 242 mutable uint32_t fUniqueID; |
| 243 | 243 |
| 244 SkAutoTDelete<const SkPictureData> fData; | 244 // TODO: make SkPictureData const when clone method goes away |
| 245 SkAutoTDelete<SkPictureData> fData; |
| 245 int fWidth, fHeight; | 246 int fWidth, fHeight; |
| 246 mutable SkAutoTUnref<const AccelData> fAccelData; | 247 mutable SkAutoTUnref<const AccelData> fAccelData; |
| 247 | 248 |
| 248 void needsNewGenID() { fUniqueID = SK_InvalidGenID; } | 249 void needsNewGenID() { fUniqueID = SK_InvalidGenID; } |
| 249 | 250 |
| 250 // Create a new SkPicture from an existing SkPictureData. Ref count of | 251 // Create a new SkPicture from an existing SkPictureData. Ref count of |
| 251 // data is unchanged. | 252 // data is unchanged. |
| 252 SkPicture(SkPictureData* data, int width, int height); | 253 SkPicture(SkPictureData* data, int width, int height); |
| 253 | 254 |
| 254 SkPicture(int width, int height, const SkPictureRecord& record, bool deepCop
yOps); | 255 SkPicture(int width, int height, const SkPictureRecord& record, bool deepCop
yOps); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 friend class SkPicturePlayback; // to get fData | 290 friend class SkPicturePlayback; // to get fData |
| 290 | 291 |
| 291 typedef SkRefCnt INHERITED; | 292 typedef SkRefCnt INHERITED; |
| 292 | 293 |
| 293 SkPicture(int width, int height, SkRecord*); // Takes ownership. | 294 SkPicture(int width, int height, SkRecord*); // Takes ownership. |
| 294 SkAutoTDelete<SkRecord> fRecord; | 295 SkAutoTDelete<SkRecord> fRecord; |
| 295 bool fRecordWillPlayBackBitmaps; // TODO: const | 296 bool fRecordWillPlayBackBitmaps; // TODO: const |
| 296 }; | 297 }; |
| 297 | 298 |
| 298 #endif | 299 #endif |
| OLD | NEW |