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 #include "SkPictureFlat.h" | 10 #include "SkPictureFlat.h" |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 return false; | 271 return false; |
272 } | 272 } |
273 | 273 |
274 SkPictInfo info; | 274 SkPictInfo info; |
275 if (!stream->read(&info, sizeof(SkPictInfo))) { | 275 if (!stream->read(&info, sizeof(SkPictInfo))) { |
276 return false; | 276 return false; |
277 } | 277 } |
278 if (PICTURE_VERSION != info.fVersion | 278 if (PICTURE_VERSION != info.fVersion |
279 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
O | 279 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
O |
280 // V13 is backwards compatible with V12 | 280 // V13 is backwards compatible with V12 |
281 && PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .skps re
generated | 281 && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .s
kps regenerated |
| 282 #endif |
| 283 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO
O |
| 284 // V14 is backwards compatible with V13 |
| 285 && PRIOR_PICTURE_VERSION2 != info.fVersion // TODO: remove when .skps r
egenerated |
282 #endif | 286 #endif |
283 ) { | 287 ) { |
284 return false; | 288 return false; |
285 } | 289 } |
286 | 290 |
287 if (pInfo != NULL) { | 291 if (pInfo != NULL) { |
288 *pInfo = info; | 292 *pInfo = info; |
289 } | 293 } |
290 return true; | 294 return true; |
291 } | 295 } |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 } | 352 } |
349 | 353 |
350 #ifdef SK_BUILD_FOR_ANDROID | 354 #ifdef SK_BUILD_FOR_ANDROID |
351 void SkPicture::abortPlayback() { | 355 void SkPicture::abortPlayback() { |
352 if (NULL == fPlayback) { | 356 if (NULL == fPlayback) { |
353 return; | 357 return; |
354 } | 358 } |
355 fPlayback->abort(); | 359 fPlayback->abort(); |
356 } | 360 } |
357 #endif | 361 #endif |
OLD | NEW |