Fast implementation of QuadTree

bench/QuadTreeBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkQuadTree.h"
@@ skipping 162 matching lines @@
     out.fTop    = rand.nextS() % GENERATE_EXTENTS;
     out.fRight  = out.fLeft + 1 + rand.nextU() % (GENERATE_EXTENTS / 5);
     out.fBottom = out.fTop  + 1 + rand.nextU() % (GENERATE_EXTENTS / 5);
     return out;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH(
     return SkNEW_ARGS(BBoxBuildBench, ("XYordered", &make_XYordered_rects,
-                      SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxQueryBench, ("XYordered", &make_XYordered_rects,
-                      BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      BBoxQueryBench::kRandom_QueryType,
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxBuildBench, ("YXordered", &make_YXordered_rects,
-                      SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxQueryBench, ("YXordered", &make_YXordered_rects,
-                      BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      BBoxQueryBench::kRandom_QueryType,
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxBuildBench, ("random", &make_random_rects,
-                      SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxQueryBench, ("random", &make_random_rects,
-                      BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      BBoxQueryBench::kRandom_QueryType,
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxBuildBench, ("concentric", &make_concentric_rects_increasing,
-                      SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )
 DEF_BENCH(
     return SkNEW_ARGS(BBoxQueryBench, ("concentric", &make_concentric_rects_increasing,
-                      BBoxQueryBench::kRandom_QueryType, SkQuadTree::Create(QUAD_TREE_BOUNDS)));
+                      BBoxQueryBench::kRandom_QueryType,
+                      SkNEW_ARGS(SkQuadTree, (QUAD_TREE_BOUNDS))));
 )