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

bench/RTreeBench.cpp

Index: bench/RTreeBench.cpp
diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp
index 21c1d79a94730e5827f419c0d23297145cec11e6..08d6bf4bdb06c99d9899c8ca87480e6d707d512f 100644
--- a/bench/RTreeBench.cpp
+++ b/bench/RTreeBench.cpp
@@ -24,7 +24,7 @@ typedef SkRect (*MakeRectProc)(SkRandom&, int, int);
 class RTreeBuildBench : public Benchmark {
 public:
     RTreeBuildBench(const char* name, MakeRectProc proc, bool bulkLoad,
-                    SkBBoxHierarchy* tree)
+                    SkRTree* tree)
         : fTree(tree)
         , fProc(proc)
         , fBulkLoad(bulkLoad) {
@@ -58,7 +58,7 @@ protected:
         }
     }
 private:
-    SkBBoxHierarchy* fTree;
+    SkRTree* fTree;
     MakeRectProc fProc;
     SkString fName;
     bool fBulkLoad;
@@ -76,7 +76,7 @@ public:
     };
 
     RTreeQueryBench(const char* name, MakeRectProc proc, bool bulkLoad,
-                    QueryType q, SkBBoxHierarchy* tree)
+                    QueryType q, SkRTree* tree)
         : fTree(tree)
         , fProc(proc)
         , fBulkLoad(bulkLoad)