From 2420e10d5a86da1964a05a749ab9bb625ae9f13e Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 29 Apr 2015 08:16:50 -0700 Subject: Straighten out SkPicture::AccelData APIs. Must have been we needed them to be weird (mutable, const setter) before. It doesn't look like that's necessary now... we can just pass it to the constructor. BUG=skia: Review URL: https://codereview.chromium.org/1112833003 --- src/core/SkPicture.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/core/SkPicture.cpp') diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 619be8b3ca..c014879354 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -241,10 +241,6 @@ SkPicture::~SkPicture() { } } -void SkPicture::EXPERIMENTAL_addAccelData(const SkPicture::AccelData* data) const { - fAccelData.reset(SkRef(data)); -} - const SkPicture::AccelData* SkPicture::EXPERIMENTAL_getAccelData( SkPicture::AccelData::Key key) const { if (fAccelData.get() && fAccelData->getKey() == key) { @@ -452,13 +448,18 @@ bool SkPicture::hasText() const { return fAnalysis.fHasText; } bool SkPicture::willPlayBackBitmaps() const { return fAnalysis.fWillPlaybackBitmaps; } int SkPicture::approximateOpCount() const { return fRecord->count(); } -SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SnapshotArray* drawablePicts, - SkBBoxHierarchy* bbh, size_t approxBytesUsedBySubPictures) +SkPicture::SkPicture(const SkRect& cullRect, + SkRecord* record, + SnapshotArray* drawablePicts, + SkBBoxHierarchy* bbh, + AccelData* accelData, + size_t approxBytesUsedBySubPictures) : fUniqueID(0) , fCullRect(cullRect) - , fRecord(record) // For performance, we take ownership of the caller's ref. - , fBBH(bbh) // Ditto. - , fDrawablePicts(drawablePicts) // take ownership + , fRecord(record) // Take ownership of caller's ref. + , fDrawablePicts(drawablePicts) // Take ownership. + , fBBH(bbh) // Take ownership of caller's ref. + , fAccelData(accelData) // Take ownership of caller's ref. , fApproxBytesUsedBySubPictures(approxBytesUsedBySubPictures) , fAnalysis(*fRecord) {} -- cgit v1.2.3