Remove SkQuadTree.

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 674cab9dc0fe8cc2f3e0a25edc1f9ba7d717d74b..cf9e25b4822009aee4851d4b65c142d5d1c210b3 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -142,7 +142,6 @@ enum BbhType {
     kNone_BbhType,
     kRTree_BbhType,
     kTileGrid_BbhType,
-    kQuadTree_BbhType
 };
 
 enum ConfigFlags {
@@ -1022,8 +1021,6 @@ public:
             info.fOffset.setZero();
             info.fTileInterval.set(16, 16);
             factory.reset(SkNEW_ARGS(SkTileGridFactory, (info)));
-        } else if (kQuadTree_BbhType == bbhType) {
-            factory.reset(SkNEW(SkQuadTreeFactory));
         } else if (kRTree_BbhType == bbhType) {
             factory.reset(SkNEW(SkRTreeFactory));
         }
@@ -1466,7 +1463,6 @@ DEFINE_string(mismatchPath, "", "Write images for tests that failed due to "
 DEFINE_string(modulo, "", "[--modulo <remainder> <divisor>]: only run tests for which "
               "testIndex %% divisor == remainder.");
 DEFINE_bool(pipe, false, "Exercise the SkGPipe replay test pass.");
-DEFINE_bool(quadtree, false, "Exercise the QuadTree variant of SkPicture test pass.");
 DEFINE_string2(readPath, r, "", "Read reference images from this dir, and report "
                "any differences between those and the newly generated ones.");
 DEFINE_bool(replay, false, "Exercise the SkPicture replay test pass.");
@@ -1639,23 +1635,6 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co
         }
     }
 
-    if (FLAGS_quadtree) {
-        const char renderModeDescriptor[] = "-quadtree";
-        if ((gmFlags & GM::kSkipPicture_Flag) || (gmFlags & GM::kSkipTiled_Flag)) {
-            gmmain.RecordTestResults(kIntentionallySkipped_ErrorType, shortNamePlusConfig,
-                                     renderModeDescriptor);
-            errorsForAllModes.add(kIntentionallySkipped_ErrorType);
-        } else {
-            SkPicture* pict = gmmain.generate_new_picture(gm, kQuadTree_BbhType, 0);
-            SkAutoUnref aur(pict);
-            SkBitmap bitmap;
-            gmmain.generate_image_from_picture(gm, compareConfig, pict, &bitmap);
-            errorsForAllModes.add(gmmain.compare_test_results_to_reference_bitmap(
-                gm->getName(), compareConfig.fName, renderModeDescriptor, bitmap,
-                &comparisonBitmap));
-        }
-    }
-
     if (FLAGS_tileGrid) {
         for(int scaleIndex = 0; scaleIndex < tileGridReplayScales.count(); ++scaleIndex) {
             SkScalar replayScale = tileGridReplayScales[scaleIndex];