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

Fix visual bench memory leak

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1239103002
This commit is contained in:
joshualitt 2015-07-16 14:23:22 -07:00 committed by Commit bot
parent ef14cb397c
commit 47d280d3b0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/VisualBench/VisualBench.cpp
View File

@ -163,10 +163,7 @@ bool VisualBench::advanceRecordIfNecessary(SkCanvas* canvas) {
return true;
}
while ((fBenchmark = fBenchmarkStream->next()) &&
(SkCommandLineFlags::ShouldSkip(FLAGS_match, fBenchmark->getUniqueName()) ||
!fBenchmark->isSuitableFor(Benchmark::kGPU_Backend))) {}
fBenchmark.reset(fBenchmarkStream->next());
if (!fBenchmark) {
return false;
}
@ -238,7 +235,7 @@ void VisualBench::draw(SkCanvas* canvas) {
fState = kPreWarmLoops_State;
this->printStats();
fBenchmark->perCanvasPostDraw(canvas);
fBenchmark = NULL;
fBenchmark.reset(NULL);
fCurrentSample = 0;
fFlushes = 1;
fLoops = 1;

2
tools/VisualBench/VisualBench.h
View File

@ -68,7 +68,7 @@ private:
WallTimer fTimer;
State fState;
SkAutoTDelete<VisualBenchmarkStream> fBenchmarkStream;
Benchmark* fBenchmark;
SkAutoTUnref<Benchmark> fBenchmark;
// support framework
SkAutoTUnref<SkSurface> fSurface;

5
tools/VisualBench/VisualBenchmarkStream.cpp
View File

@ -68,7 +68,9 @@ Benchmark* VisualBenchmarkStream::next() {
Benchmark* bench;
// skips non matching benches
while ((bench = this->innerNext()) &&
SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName())) {
(SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
!bench->isSuitableFor(Benchmark::kGPU_Backend))) {
bench->unref();
}
return bench;
}
@ -82,6 +84,7 @@ Benchmark* VisualBenchmarkStream::innerNext() {
fBenchType = "micro";
return bench;
}
bench->unref();
}
while (fGMs) {