diff options
| author |  mtklein <mtklein@chromium.org> | 2014-08-26 14:07:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-26 14:07:04 -0700 |
| commit | 2a65a238b0e688356aee09d08f3f8a317359b4d2 (patch) | |
| tree | 4ba271569b87c2e01d6e5451d8074c433f8d1d99 /dm | |
| parent | 8a914a76501d0bb4c60f8dbd1ae39c864688695b (diff) | |
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
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMCpuGMTask.cpp | 5 | ||||
| -rw-r--r-- | dm/DMQuiltTask.cpp | 5 | ||||
| -rw-r--r-- | dm/DMQuiltTask.h | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/dm/DMCpuGMTask.cpp b/dm/DMCpuGMTask.cpp index 0127095d06..e3dd0eaf98 100644 --- a/dm/DMCpuGMTask.cpp +++ b/dm/DMCpuGMTask.cpp @@ -45,11 +45,6 @@ void CpuGMTask::draw() { SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kRTree_BBH, QuiltTask::kSkRecord_Backend); SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kTileGrid_BBH, QuiltTask::kSkRecord_Backend); - /* skia:2834 SkQuadTree does not return its data in the order it was inserted. - SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kQuadTree_BBH, QuiltTask::kDefault_Backend); - SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kQuadTree_BBH, QuiltTask::kSkRecord_Backend); - */ - SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kNormal_Mode); SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kSkRecord_Mode); diff --git a/dm/DMQuiltTask.cpp b/dm/DMQuiltTask.cpp index 469b20f433..6961f09671 100644 --- a/dm/DMQuiltTask.cpp +++ b/dm/DMQuiltTask.cpp @@ -14,7 +14,7 @@ namespace DM { static SkString suffix(QuiltTask::Backend backend, QuiltTask::BBH bbh) { static const char* kBackends[] = { "default", "skrecord" }; - static const char* kBBHs[] = { "nobbh", "rtree", "quadtree", "tilegrid" }; + static const char* kBBHs[] = { "nobbh", "rtree", "tilegrid" }; return SkStringPrintf("%s-%s", kBackends[backend], kBBHs[bbh]); } @@ -65,9 +65,6 @@ void QuiltTask::draw() { case kRTree_BBH: factory.reset(SkNEW(SkRTreeFactory)); break; - case kQuadTree_BBH: - factory.reset(SkNEW(SkQuadTreeFactory)); - break; case kTileGrid_BBH: { const SkTileGridFactory::TileGridInfo tiles = { { FLAGS_quiltTile, FLAGS_quiltTile }, diff --git a/dm/DMQuiltTask.h b/dm/DMQuiltTask.h index 79d82166f7..0b49d12df2 100644 --- a/dm/DMQuiltTask.h +++ b/dm/DMQuiltTask.h @@ -16,7 +16,6 @@ public: enum BBH { kNone_BBH, kRTree_BBH, - kQuadTree_BBH, kTileGrid_BBH, }; enum Backend { |