commit 2a65a238b0e688356aee09d08f3f8a317359b4d2
author mtklein <mtklein@chromium.org> Tue Aug 26 14:07:04 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 26 14:07:04 2014 -0700
tree 4ba271569b87c2e01d6e5451d8074c433f8d1d99
parent 8a914a76501d0bb4c60f8dbd1ae39c864688695b

Remove SkQuadTree.

We're not testing it to the same degree we do RTree and TileGrid.  Any changes
we'll make to BBH APIs become 33% easier without it.  If find we want it again,
we can always resurrect it.

BUG=skia:1021,skia:2834
R=robertphillips@google.com, mtklein@google.com
TBR=reed

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/500373005

tools/PictureRenderer.h

diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index f11b198..04ac20f 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -56,7 +56,6 @@
 
     enum BBoxHierarchyType {
         kNone_BBoxHierarchyType = 0,
-        kQuadTree_BBoxHierarchyType,
         kRTree_BBoxHierarchyType,
         kTileGrid_BBoxHierarchyType,
 
@@ -90,10 +89,10 @@
      * @param useChecksumBasedFilenames Whether to use checksum-based filenames when writing
      *     bitmap images to disk.
      */
-    virtual void init(const SkPicture* pict, 
-                      const SkString* writePath, 
+    virtual void init(const SkPicture* pict,
+                      const SkString* writePath,
                       const SkString* mismatchPath,
-                      const SkString* inputFilename, 
+                      const SkString* inputFilename,
                       bool useChecksumBasedFilenames);
 
     /**
@@ -261,8 +260,6 @@
         }
         if (kRTree_BBoxHierarchyType == fBBoxHierarchyType) {
             config.append("_rtree");
-        } else if (kQuadTree_BBoxHierarchyType == fBBoxHierarchyType) {
-            config.append("_quadtree");
         } else if (kTileGrid_BBoxHierarchyType == fBBoxHierarchyType) {
             config.append("_grid");
             config.append("_");
@@ -311,8 +308,6 @@
         }
         if (kRTree_BBoxHierarchyType == fBBoxHierarchyType) {
             result["bbh"] = "rtree";
-        } else if (kQuadTree_BBoxHierarchyType == fBBoxHierarchyType) {
-            result["bbh"] = "quadtree";
         } else if (kTileGrid_BBoxHierarchyType == fBBoxHierarchyType) {
             SkString tmp("grid_");
             tmp.appendS32(fGridInfo.fTileInterval.width());
@@ -416,7 +411,7 @@
     const SkPicture* getPicture() {
         return fPicture;
     }
-    
+
 #if SK_SUPPORT_GPU
     explicit PictureRenderer(const GrContext::Options &opts)
 #else
@@ -550,9 +545,9 @@
 #endif
 
     virtual void init(const SkPicture* pict,
-                      const SkString* writePath, 
+                      const SkString* writePath,
                       const SkString* mismatchPath,
-                      const SkString* inputFilename, 
+                      const SkString* inputFilename,
                       bool useChecksumBasedFilenames) SK_OVERRIDE;
 
     virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE;
@@ -571,10 +566,10 @@
     TiledPictureRenderer();
 #endif
 
-    virtual void init(const SkPicture* pict, 
-                      const SkString* writePath, 
+    virtual void init(const SkPicture* pict,
+                      const SkString* writePath,
                       const SkString* mismatchPath,
-                      const SkString* inputFilename, 
+                      const SkString* inputFilename,
                       bool useChecksumBasedFilenames) SK_OVERRIDE;
 
     /**