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

src/core/SkRTree.h

Index: src/core/SkRTree.h
diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h
index 85469ccc4ce346a0c0b7934ba7e61bf6d096a69e..a018d9c2a35c94736de52ed19131a603b0e1feb6 100644
--- a/src/core/SkRTree.h
+++ b/src/core/SkRTree.h
@@ -79,22 +79,12 @@ public:
      */
     virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE;
 

[robertphillips, 2014/10/02 16:07:58]

keep the comments?

[mtklein, 2014/10/02 16:14:39]

Done.

-    virtual void clear() SK_OVERRIDE;
-    bool isEmpty() const { return 0 == fCount; }
-
-    /**
-     * Gets the depth of the tree structure
-     */
-    virtual int getDepth() const SK_OVERRIDE {
-        return this->isEmpty() ? 0 : fRoot.fChild.subtree->fLevel + 1;
-    }
-
-    /**
-     * This gets the insertion count (rather than the node count)
-     */
-    virtual int getCount() const SK_OVERRIDE { return fCount; }
+    int getDepth() const { return 0 == fCount ? 0 : fRoot.fChild.subtree->fLevel + 1; }
+    int getCount() const { return fCount; }
+    void clear();
 
 private:
+    bool isEmpty() const { return 0 == this->getCount(); }
 
     struct Node;