diff options
author | robertphillips <robertphillips@google.com> | 2014-09-04 08:42:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 08:42:50 -0700 |
commit | c5ba71d2e5cd426def66fa49dcf003e5b2c98dc7 (patch) | |
tree | 120359b17c8143f85462fefd855d2d94b50ce785 /src | |
parent | 227c54e3d4e7b738d0b11a2f68b63cb1fd79cb12 (diff) |
Change SkPicture::draw to playback
R=reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/540963002
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
-rw-r--r-- | src/core/SkPicture.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPictureRecorder.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 83fe1407d5..3d2fc8c498 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2455,7 +2455,7 @@ void SkCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect()); - picture->draw(this); + picture->playback(this); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index c0fc371054..e80a17bd22 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -327,7 +327,7 @@ const SkMatrix& SkPicture::OperationList::matrix(int index) const { } // fRecord OK -void SkPicture::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) const { +void SkPicture::playback(SkCanvas* canvas, SkDrawPictureCallback* callback) const { SkASSERT(NULL != canvas); SkASSERT(NULL != fData.get() || NULL != fRecord.get()); @@ -459,7 +459,7 @@ SkPicture::SkPicture(SkPictureData* data, SkScalar width, SkScalar height) SkPicture* SkPicture::Forwardport(const SkPicture& src) { SkAutoTDelete<SkRecord> record(SkNEW(SkRecord)); SkRecorder canvas(record.get(), src.cullRect().width(), src.cullRect().height()); - src.draw(&canvas); + src.playback(&canvas); return SkNEW_ARGS(SkPicture, (src.cullRect().width(), src.cullRect().height(), record.detach(), NULL/*bbh*/)); } diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp index fadb937110..92deac36d2 100644 --- a/src/core/SkPictureRecorder.cpp +++ b/src/core/SkPictureRecorder.cpp @@ -108,6 +108,6 @@ void SkPictureRecorder::partialReplay(SkCanvas* canvas) const { const bool deepCopyOps = true; SkPicture picture(fCullWidth, fCullHeight, *fPictureRecord.get(), deepCopyOps); - picture.draw(canvas); + picture.playback(canvas); } } |