From 2a65a238b0e688356aee09d08f3f8a317359b4d2 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 26 Aug 2014 14:07:04 -0700 Subject: 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 --- gm/gmmain.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gm') diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 674cab9dc0..cf9e25b482 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 ]: 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]; -- cgit v1.2.3