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

src/core/SkRTree.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRTree_DEFINED
 #define SkRTree_DEFINED
@@ skipping 60 matching lines @@
 
     /**
      * If any inserts have been deferred, this will add them into the tree
      */
     virtual void flushDeferredInserts() SK_OVERRIDE;
 
     /**
      * Given a query rectangle, populates the passed-in array with the elements it intersects
      */
     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;
 
     /**
      * A branch of the tree, this may contain a pointer to another interior node, or a data value
      */
     struct Branch {
         union {
             Node* subtree;
             unsigned opIndex;
@@ skipping 82 matching lines @@
     SkTDArray<Branch> fDeferredInserts;
     SkScalar fAspectRatio;
     bool fSortWhenBulkLoading;
 
     Node* allocateNode(uint16_t level);
 
     typedef SkBBoxHierarchy INHERITED;
 };
 
 #endif