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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 } | 286 } |
287 if (PICTURE_VERSION != info.fVersion | 287 if (PICTURE_VERSION != info.fVersion |
288 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
O | 288 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
O |
289 // V13 is backwards compatible with V12 | 289 // V13 is backwards compatible with V12 |
290 && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .s
kps regenerated | 290 && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .s
kps regenerated |
291 #endif | 291 #endif |
292 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO
O | 292 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TO
O |
293 // V14 is backwards compatible with V13 | 293 // V14 is backwards compatible with V13 |
294 && PRIOR_PICTURE_VERSION2 != info.fVersion // TODO: remove when .skps r
egenerated | 294 && PRIOR_PICTURE_VERSION2 != info.fVersion // TODO: remove when .skps r
egenerated |
295 #endif | 295 #endif |
| 296 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TO
O |
| 297 // V16 is backwards compatible with V15 |
| 298 && PRIOR_PICTURE_VERSION3 != info.fVersion // TODO: remove when .skps r
egenerated |
| 299 #endif |
296 ) { | 300 ) { |
297 return false; | 301 return false; |
298 } | 302 } |
299 | 303 |
300 if (pInfo != NULL) { | 304 if (pInfo != NULL) { |
301 *pInfo = info; | 305 *pInfo = info; |
302 } | 306 } |
303 return true; | 307 return true; |
304 } | 308 } |
305 | 309 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 } | 377 } |
374 | 378 |
375 #ifdef SK_BUILD_FOR_ANDROID | 379 #ifdef SK_BUILD_FOR_ANDROID |
376 void SkPicture::abortPlayback() { | 380 void SkPicture::abortPlayback() { |
377 if (NULL == fPlayback) { | 381 if (NULL == fPlayback) { |
378 return; | 382 return; |
379 } | 383 } |
380 fPlayback->abort(); | 384 fPlayback->abort(); |
381 } | 385 } |
382 #endif | 386 #endif |
OLD | NEW |