Demote getCount, getDepth, and clear to RTree-only methods.

bench/RTreeBench.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 "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkRTree.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 // confine rectangles to a smallish area, so queries generally hit something, and overlap occurs:
 static const SkScalar GENERATE_EXTENTS = 1000.0f;
 static const int NUM_BUILD_RECTS = 500;
 static const int NUM_QUERY_RECTS = 5000;
 static const int GRID_WIDTH = 100;
 
 typedef SkRect (*MakeRectProc)(SkRandom&, int, int);
 
 // Time how long it takes to build an R-Tree either bulk-loaded or not
 class RTreeBuildBench : public Benchmark {
 public:
     RTreeBuildBench(const char* name, MakeRectProc proc, bool bulkLoad,
-                    SkBBoxHierarchy* tree)
+                    SkRTree* tree)
         : fTree(tree)
         , fProc(proc)
         , fBulkLoad(bulkLoad) {
         fName.append("rtree_");
         fName.append(name);
         fName.append("_build");
         if (fBulkLoad) {
             fName.append("_bulk");
         }
     }
@@ skipping 13 matching lines @@
         SkRandom rand;
         for (int i = 0; i < loops; ++i) {
             for (int j = 0; j < NUM_BUILD_RECTS; ++j) {
                 fTree->insert(j, fProc(rand, j, NUM_BUILD_RECTS), fBulkLoad);
             }
             fTree->flushDeferredInserts();
             fTree->clear();
         }
     }
 private:
-    SkBBoxHierarchy* fTree;
+    SkRTree* fTree;
     MakeRectProc fProc;
     SkString fName;
     bool fBulkLoad;
     typedef Benchmark INHERITED;
 };
 
 // Time how long it takes to perform queries on an R-Tree, bulk-loaded or not
 class RTreeQueryBench : public Benchmark {
 public:
     enum QueryType {
         kSmall_QueryType, // small queries
         kLarge_QueryType, // large queries
         kRandom_QueryType,// randomly sized queries
         kFull_QueryType   // queries that cover everything
     };
 
     RTreeQueryBench(const char* name, MakeRectProc proc, bool bulkLoad,
-                    QueryType q, SkBBoxHierarchy* tree)
+                    QueryType q, SkRTree* tree)
         : fTree(tree)
         , fProc(proc)
         , fBulkLoad(bulkLoad)
         , fQuery(q) {
         fName.append("rtree_");
         fName.append(name);
         fName.append("_query");
         if (fBulkLoad) {
             fName.append("_bulk");
         }
@@ skipping 167 matching lines @@
                       &make_concentric_rects_increasing, true, SkRTree::Create(5, 16, 1, false)));
 )
 DEF_BENCH(
     return SkNEW_ARGS(RTreeQueryBench, ("concentric", &make_concentric_rects_increasing, true,
                       RTreeQueryBench::kRandom_QueryType, SkRTree::Create(5, 16)));
 )
 DEF_BENCH(
     return SkNEW_ARGS(RTreeQueryBench, ("(unsorted)concentric", &make_concentric_rects_increasing, true,
                       RTreeQueryBench::kRandom_QueryType, SkRTree::Create(5, 16, 1, false)));
 )