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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 size_t SkPicture::EXPERIMENTAL_curOpID() const { | 300 size_t SkPicture::EXPERIMENTAL_curOpID() const { |
301 if (NULL != fPlayback) { | 301 if (NULL != fPlayback) { |
302 return fPlayback->curOpID(); | 302 return fPlayback->curOpID(); |
303 } | 303 } |
304 return 0; | 304 return 0; |
305 } | 305 } |
306 | 306 |
307 void SkPicture::draw(SkCanvas* surface, SkDrawPictureCallback* callback) { | 307 void SkPicture::draw(SkCanvas* surface, SkDrawPictureCallback* callback) { |
308 this->endRecording(); | 308 this->endRecording(); |
309 if (NULL != fPlayback) { | 309 if (NULL != fPlayback) { |
310 fPlayback->draw(*surface, callback); | 310 fPlayback->draw(*surface, -1, -1, callback, NULL); |
311 } | 311 } |
312 } | 312 } |
313 | 313 |
314 /////////////////////////////////////////////////////////////////////////////// | 314 /////////////////////////////////////////////////////////////////////////////// |
315 | 315 |
316 #include "SkStream.h" | 316 #include "SkStream.h" |
317 | 317 |
318 static const char kMagic[] = { 's', 'k', 'i', 'a', 'p', 'i', 'c', 't' }; | 318 static const char kMagic[] = { 's', 'k', 'i', 'a', 'p', 'i', 'c', 't' }; |
319 | 319 |
320 bool SkPicture::IsValidPictInfo(const SkPictInfo& info) { | 320 bool SkPicture::IsValidPictInfo(const SkPictInfo& info) { |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 if (NULL != fRecord) { | 514 if (NULL != fRecord) { |
515 SkASSERT(NULL == fPlayback); | 515 SkASSERT(NULL == fPlayback); |
516 return SK_InvalidGenID; | 516 return SK_InvalidGenID; |
517 } | 517 } |
518 | 518 |
519 if (SK_InvalidGenID == fUniqueID) { | 519 if (SK_InvalidGenID == fUniqueID) { |
520 fUniqueID = next_picture_generation_id(); | 520 fUniqueID = next_picture_generation_id(); |
521 } | 521 } |
522 return fUniqueID; | 522 return fUniqueID; |
523 } | 523 } |
OLD | NEW |