Update old tools to allow MultiPictureDraw rendering

tools/bbh_shootout.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Timer.h"
 #include "Benchmark.h"
 #include "LazyDecodeBitmap.h"
@@ skipping 42 matching lines @@
  * This function is the sink to which all work ends up going.
  * @param renderer The renderer to use to perform the work.
  *                 To measure rendering, use a TiledPictureRenderer.
  *                 To measure recording, use a RecordPictureRenderer.
  * @param bBoxType The bounding box hierarchy type to use.
  * @param pic The picture to draw to the renderer.
  * @param numRepeats The number of times to repeat the draw.
  * @param timer The timer used to benchmark the work.
  */
 static void do_benchmark_work(sk_tools::PictureRenderer* renderer,
-        BBoxType bBoxType,
-        SkPicture* pic,
-        const int numRepeats,
-        Timer* timer) {
+                              BBoxType bBoxType,
+                              SkPicture* pic,
+                              const int numRepeats,
+                              Timer* timer) {
     renderer->setBBoxHierarchyType(bBoxType);
     renderer->setGridSize(FLAGS_tilesize, FLAGS_tilesize);
-    renderer->init(pic, NULL, NULL, NULL, false);
+    renderer->init(pic, NULL, NULL, NULL, false, false);
 
     SkDebugf("%s %d times...\n", renderer->getConfigName().c_str(), numRepeats);
     for (int i = 0; i < numRepeats; ++i) {
         renderer->setup();
         // Render once to fill caches
         renderer->render();
         // Render again to measure
         timer->start();
         renderer->render();
         timer->end();
@@ skipping 114 matching lines @@
     }
     SkDebugf("\nWrote data to gnuplot-readable files: %s %s\n", pbTitle, recTitle);
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif