Begin instanced rendering for simple shapes

bench/ShapesBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
@@ skipping 230 matching lines @@
     SkRRect               fRRect;
     SkRRect               fInnerRect;
     SkRRect               fInnerOval;
     SkRRect               fInnerRRect;
     SkTArray<ShapeInfo>   fShapes;
 
 
     typedef Benchmark INHERITED;
 };
 
+#if ENABLE_COMMAND_LINE_SHAPES_BENCH
+DEF_BENCH(return new ShapesBench;)
+#else
 // Small primitives (CPU bound, in theory):
 DEF_BENCH(return new ShapesBench(ShapesBench::kRect_ShapesType, ShapesBench::kNone_ShapesType,
                                  10000, SkISize::Make(32, 32), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kOval_ShapesType, ShapesBench::kNone_ShapesType,
                                  10000, SkISize::Make(32, 32), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kOval_ShapesType, ShapesBench::kNone_ShapesType,
                                  10000, SkISize::Make(32, 33), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kRRect_ShapesType, ShapesBench::kNone_ShapesType,
                                  10000, SkISize::Make(32, 32), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kMixed_ShapesType, ShapesBench::kNone_ShapesType,
@@ skipping 14 matching lines @@
 // Donuts (small and large). These fall-back to path rendering due to non-orthogonal rotation
 // making them quite slow. Thus, reduce the counts substantially:
 DEF_BENCH(return new ShapesBench(ShapesBench::kRect_ShapesType, ShapesBench::kRect_ShapesType,
                                  500, SkISize::Make(32, 32), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kRRect_ShapesType, ShapesBench::kRRect_ShapesType,
                                  500, SkISize::Make(32, 32), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kRect_ShapesType, ShapesBench::kRect_ShapesType,
                                  50, SkISize::Make(500, 500), false);)
 DEF_BENCH(return new ShapesBench(ShapesBench::kRRect_ShapesType, ShapesBench::kRRect_ShapesType,
                                  50, SkISize::Make(500, 500), false);)
-
-#if ENABLE_COMMAND_LINE_SHAPES_BENCH
-DEF_BENCH(return new ShapesBench;)
 #endif