From 1bdfd3f4f09e47364f76d3f08177b1ce844ac786 Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 24 Nov 2014 14:41:51 -0800 Subject: option to return drawable from recording patch from issue 747033005 at patchset 80001 (http://crrev.com/747033005#ps80001) BUG=skia: Review URL: https://codereview.chromium.org/732653004 --- src/core/SkPicture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/SkPicture.cpp') diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index b4c3063991..3e006c1672 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -319,7 +319,7 @@ void SkPicture::playback(SkCanvas* canvas, SkDrawPictureCallback* callback) cons (void)canvas->getClipBounds(&clipBounds); const bool useBBH = !clipBounds.contains(this->cullRect()); - SkRecordDraw(*fRecord, canvas, this->drawablePicts(), this->drawableCount(), + SkRecordDraw(*fRecord, canvas, this->drawablePicts(), NULL, this->drawableCount(), useBBH ? fBBH.get() : NULL, callback); } @@ -474,7 +474,7 @@ SkPictureData* SkPicture::Backport(const SkRecord& src, const SkPictInfo& info, SkPicture const* const drawablePicts[], int drawableCount) { SkPictureRecord rec(SkISize::Make(info.fCullRect.width(), info.fCullRect.height()), 0/*flags*/); rec.beginRecording(); - SkRecordDraw(src, &rec, drawablePicts, drawableCount, NULL/*bbh*/, NULL/*callback*/); + SkRecordDraw(src, &rec, drawablePicts, NULL, drawableCount, NULL/*bbh*/, NULL/*callback*/); rec.endRecording(); return SkNEW_ARGS(SkPictureData, (rec, info, false/*deep copy ops?*/)); } @@ -526,8 +526,8 @@ SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SnapshotArray* dr SkBBoxHierarchy* bbh) : fUniqueID(next_picture_generation_id()) , fCullRect(cullRect) - , fRecord(record) + , fRecord(SkRef(record)) , fBBH(SkSafeRef(bbh)) - , fDrawablePicts(drawablePicts) + , fDrawablePicts(drawablePicts) // take ownership , fAnalysis(*fRecord) {} -- cgit v1.2.3