| 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" |
| 11 #include "SkPicturePlayback.h" | 11 #include "SkPicturePlayback.h" |
| 12 #include "SkPictureRecord.h" | 12 #include "SkPictureRecord.h" |
| 13 | 13 |
| 14 #include "SkBBHFactory.h" |
| 14 #include "SkBitmapDevice.h" | 15 #include "SkBitmapDevice.h" |
| 15 #include "SkCanvas.h" | 16 #include "SkCanvas.h" |
| 16 #include "SkChunkAlloc.h" | 17 #include "SkChunkAlloc.h" |
| 17 #include "SkPicture.h" | 18 #include "SkPicture.h" |
| 18 #include "SkRegion.h" | 19 #include "SkRegion.h" |
| 19 #include "SkStream.h" | 20 #include "SkStream.h" |
| 20 #include "SkTDArray.h" | 21 #include "SkTDArray.h" |
| 21 #include "SkTSearch.h" | 22 #include "SkTSearch.h" |
| 22 #include "SkTime.h" | 23 #include "SkTime.h" |
| 23 | 24 |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 if (NULL != fRecord) { | 560 if (NULL != fRecord) { |
| 560 SkASSERT(NULL == fPlayback); | 561 SkASSERT(NULL == fPlayback); |
| 561 return SK_InvalidGenID; | 562 return SK_InvalidGenID; |
| 562 } | 563 } |
| 563 | 564 |
| 564 if (SK_InvalidGenID == fUniqueID) { | 565 if (SK_InvalidGenID == fUniqueID) { |
| 565 fUniqueID = next_picture_generation_id(); | 566 fUniqueID = next_picture_generation_id(); |
| 566 } | 567 } |
| 567 return fUniqueID; | 568 return fUniqueID; |
| 568 } | 569 } |
| OLD | NEW |