Cut down SkBBH API more.

tests/RTreeTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRTree.h"
 #include "SkRandom.h"
 #include "SkTSort.h"
@@ skipping 11 matching lines @@
     while (rect.isEmpty()) {
         rect.fLeft   = rand.nextRangeF(0, 1000);
         rect.fRight  = rand.nextRangeF(0, 1000);
         rect.fTop    = rand.nextRangeF(0, 1000);
         rect.fBottom = rand.nextRangeF(0, 1000);
         rect.sort();
     }
     return rect;
 }
 
-static void random_data_rects(SkRandom& rand, SkRect out[], int n) {
-    for (int i = 0; i < n; ++i) {
-        out[i] = random_rect(rand);
-    }
-}
-
 static bool verify_query(SkRect query, SkRect rects[], SkTDArray<unsigned>& found) {
     // TODO(mtklein): no need to do this after everything's SkRects
     query.roundOut();
 
     SkTDArray<unsigned> expected;
 
     // manually intersect with every rectangle
     for (int i = 0; i < NUM_RECTS; ++i) {
         if (SkRect::Intersects(query, rects[i])) {
             expected.push(i);
@@ skipping 18 matching lines @@
                        SkRTree& tree) {
     for (size_t i = 0; i < NUM_QUERIES; ++i) {
         SkTDArray<unsigned> hits;
         SkRect query = random_rect(rand);
         tree.search(query, &hits);
         REPORTER_ASSERT(reporter, verify_query(query, rects, hits));
     }
 }
 
 static void rtree_test_main(SkRTree* rtree, skiatest::Reporter* reporter) {
-    SkRect rects[NUM_RECTS];
-    SkRandom rand;
-    REPORTER_ASSERT(reporter, rtree);
+    SkASSERT(rtree);
 
     int expectedDepthMin = -1;
     int expectedDepthMax = -1;
 
     int tmp = NUM_RECTS;
     while (tmp > 0) {
         tmp -= static_cast<int>(pow(static_cast<double>(MAX_CHILDREN),
                                 static_cast<double>(expectedDepthMin + 1)));
         ++expectedDepthMin;
     }
 
     tmp = NUM_RECTS;
     while (tmp > 0) {
         tmp -= static_cast<int>(pow(static_cast<double>(MIN_CHILDREN),
                                 static_cast<double>(expectedDepthMax + 1)));
         ++expectedDepthMax;
     }
 
+    SkRandom rand;
+    SkAutoTMalloc<SkRect> rects(NUM_RECTS);
     for (size_t i = 0; i < NUM_ITERATIONS; ++i) {
-        random_data_rects(rand, rects, NUM_RECTS);
+        rtree->clear();
+        REPORTER_ASSERT(reporter, 0 == rtree->getCount());
 
-        // First try bulk-loaded inserts
-        for (int i = 0; i < NUM_RECTS; ++i) {
-            rtree->insert(i, rects[i], true);
+        for (int j = 0; j < NUM_RECTS; j++) {
+            rects[j] = random_rect(rand);
         }
-        rtree->flushDeferredInserts();
+
+        rtree->insert(&rects, NUM_RECTS);
+        SkASSERT(rects);  // SkRTree doesn't take ownership of rects.
+
         run_queries(reporter, rand, rects, *rtree);
         REPORTER_ASSERT(reporter, NUM_RECTS == rtree->getCount());
         REPORTER_ASSERT(reporter, expectedDepthMin <= rtree->getDepth() &&
                                   expectedDepthMax >= rtree->getDepth());
-        rtree->clear();
-        REPORTER_ASSERT(reporter, 0 == rtree->getCount());
-
-        // Then try immediate inserts
-        for (int i = 0; i < NUM_RECTS; ++i) {
-            rtree->insert(i, rects[i]);
-        }
-        run_queries(reporter, rand, rects, *rtree);
-        REPORTER_ASSERT(reporter, NUM_RECTS == rtree->getCount());
-        REPORTER_ASSERT(reporter, expectedDepthMin <= rtree->getDepth() &&
-                                  expectedDepthMax >= rtree->getDepth());
-        rtree->clear();
-        REPORTER_ASSERT(reporter, 0 == rtree->getCount());
-
-        // And for good measure try immediate inserts, but in reversed order
-        for (int i = NUM_RECTS - 1; i >= 0; --i) {
-            rtree->insert(i, rects[i]);
-        }
-        run_queries(reporter, rand, rects, *rtree);
-        REPORTER_ASSERT(reporter, NUM_RECTS == rtree->getCount());
-        REPORTER_ASSERT(reporter, expectedDepthMin <= rtree->getDepth() &&
-                                  expectedDepthMax >= rtree->getDepth());
-        rtree->clear();
-        REPORTER_ASSERT(reporter, 0 == rtree->getCount());
     }
 }
 
 DEF_TEST(RTree, reporter) {
     SkRTree* rtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN);
     SkAutoUnref au(rtree);
     rtree_test_main(rtree, reporter);
 
     // Rtree that orders input rectangles on deferred insert.
     SkRTree* unsortedRtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN, 1, false);
     SkAutoUnref auo(unsortedRtree);
     rtree_test_main(unsortedRtree, reporter);
 }