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

QuadTree: don't leak deferred inserts past clear()

Browse Source 
BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/277713003

git-svn-id: http://skia.googlecode.com/svn/trunk@14670 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-09 14:33:55 +00:00
parent 95c2003740
commit 4175388afa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkQuadTree.cpp
View File

@ -46,8 +46,7 @@ static U8CPU child_intersect(const SkIRect& query, const SkIPoint& split) {
return intersect; return intersect;
} }
SkQuadTree::SkQuadTree(const SkIRect& bounds) SkQuadTree::SkQuadTree(const SkIRect& bounds) : fRoot(NULL) {
: fRoot(NULL) {
SkASSERT((bounds.width() * bounds.height()) > 0); SkASSERT((bounds.width() * bounds.height()) > 0);
fRootBounds = bounds; fRootBounds = bounds;
} }
@ -178,11 +177,14 @@ void SkQuadTree::search(const SkIRect& query, SkTDArray<void*>* results) {
} }
void SkQuadTree::clear() { void SkQuadTree::clear() {
this->flushDeferredInserts();
if (NULL != fRoot) { if (NULL != fRoot) {
this->clear(fRoot); this->clear(fRoot);
fNodePool.release(fRoot); fNodePool.release(fRoot);
fRoot = NULL; fRoot = NULL;
} }
SkASSERT(fEntryPool.allocated() == fEntryPool.available());
SkASSERT(fNodePool.allocated() == fNodePool.available());
} }
int SkQuadTree::getDepth() const { int SkQuadTree::getDepth() const {