AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

free up picturerecorder refs after returning picture or drawable

Browse Source 
this just accelerates what would happen on the next beginRecording() call or the destructor. chrome has unittests that break (shaders on the stack) if we hold on to the internals past endRecording().

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/758813002
This commit is contained in:
reed 2014-11-24 19:59:22 -08:00 committed by Commit bot
parent afa278e250
commit 26a6bf6a26
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/SkPictureRecorder.h
View File

@ -110,7 +110,6 @@ private:
SkAutoTUnref<SkBBoxHierarchy> fBBH;
SkAutoTUnref<SkRecorder> fRecorder;
SkAutoTUnref<SkRecord> fRecord;
SkBBHFactory* fBBHFactory;
typedef SkNoncopyable INHERITED;
};

24
src/core/SkPictureRecorder.cpp
View File

@ -15,7 +15,7 @@
#include "SkRecordOpts.h"
#include "SkTypes.h"
SkPictureRecorder::SkPictureRecorder() : fBBHFactory(NULL) {}
SkPictureRecorder::SkPictureRecorder() {}
SkPictureRecorder::~SkPictureRecorder() {}
@ -23,7 +23,6 @@ SkCanvas* SkPictureRecorder::beginRecording(const SkRect& cullRect,
SkBBHFactory* bbhFactory /* = NULL */,
uint32_t recordFlags /* = 0 */) {
fCullRect = cullRect;
fBBHFactory = bbhFactory;
fFlags = recordFlags;
if (bbhFactory) {
@ -68,7 +67,12 @@ SkPicture* SkPictureRecorder::endRecordingAsPicture() {
if (saveLayerData) {
pict->EXPERIMENTAL_addAccelData(saveLayerData);
}
// release our refs now, so only the picture will be the owner.
fRecorder.reset(NULL);
fRecord.reset(NULL);
fBBH.reset(NULL);
return pict;
}
@ -157,7 +161,15 @@ SkCanvasDrawable* SkPictureRecorder::EXPERIMENTAL_endRecordingAsDrawable() {
SkRecordFillBounds(fCullRect, *fRecord, fBBH.get());
}
return SkNEW_ARGS(SkRecordedDrawable, (fRecord, fBBH, fRecorder->detachDrawableList(),
fCullRect,
SkToBool(fFlags & kComputeSaveLayerInfo_RecordFlag)));
SkCanvasDrawable* drawable = SkNEW_ARGS(SkRecordedDrawable,
(fRecord, fBBH, fRecorder->detachDrawableList(),
fCullRect,
SkToBool(fFlags & kComputeSaveLayerInfo_RecordFlag)));
// release our refs now, so only the drawable will be the owner.
fRecorder.reset(NULL);
fRecord.reset(NULL);
fBBH.reset(NULL);
return drawable;
}