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

src/core/SkQuadTree.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkQuadTree.h"
 #include "SkTSort.h"
 #include <stdio.h>
@@ skipping 28 matching lines @@
         intersect &= ~kMaskLeft;
     }
     if (query.fBottom < split.fY) {
         intersect &= ~kMaskBottom;
     } else if(query.fTop >= split.fY) {
         intersect &= ~kMaskTop;
     }
     return intersect;
 }
 
-SkQuadTree::SkQuadTree(const SkIRect& bounds)
-    : fRoot(NULL) {
+SkQuadTree::SkQuadTree(const SkIRect& bounds) : fRoot(NULL) {
     SkASSERT((bounds.width() * bounds.height()) > 0);
     fRootBounds = bounds;
 }
 
 SkQuadTree::~SkQuadTree() {
 }
 
 void SkQuadTree::insert(Node* node, Entry* entry) {
     // does it belong in a child?
     if (NULL != node->fChildren[0]) {
@@ skipping 110 matching lines @@
 
 void SkQuadTree::search(const SkIRect& query, SkTDArray<void*>* results) {
     SkASSERT(NULL != fRoot);
     SkASSERT(NULL != results);
     if (SkIRect::Intersects(fRootBounds, query)) {
         this->search(fRoot, query, results);
     }
 }
 
 void SkQuadTree::clear() {
+    this->flushDeferredInserts();
     if (NULL != fRoot) {
         this->clear(fRoot);
         fNodePool.release(fRoot);
         fRoot = NULL;
     }
+    SkASSERT(fEntryPool.allocated() == fEntryPool.available());

[djsollen, 2014/05/09 14:23:08]

should we add this here as well.

SkASSERT(0 == fDeferred.getCount());

+    SkASSERT(fNodePool.allocated() == fNodePool.available());
 }
 
 int SkQuadTree::getDepth() const {
     return this->getDepth(fRoot);
 }
 
 void SkQuadTree::rewindInserts() {
     SkASSERT(fClient);
      // Currently only supports deferred inserts
     SkASSERT(NULL == fRoot);
@@ skipping 12 matching lines @@
 
 void SkQuadTree::flushDeferredInserts() {
     if (NULL == fRoot) {
         fRoot = fNodePool.acquire();
         fRoot->fBounds = fRootBounds;
     }
     while(!fDeferred.isEmpty()) {
         this->insert(fRoot, fDeferred.pop());
     }
 }