Fix segfault in bbh_shootout

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 "BenchTimer.h"
 #include "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderer.h"
 #include "SkBenchmark.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkString.h"
+#include "SkTArray.h"
 #include "TimerData.h"
 
 static const int kNumNormalRecordings = SkBENCHLOOP(10);
 static const int kNumRTreeRecordings = SkBENCHLOOP(10);
 static const int kNumPlaybacks = SkBENCHLOOP(4);
 static const size_t kNumBaseBenchmarks = 3;
 static const size_t kNumTileSizes = 3;
 static const size_t kNumBbhPlaybackBenchmarks = 3;
 static const size_t kNumBenchmarks = kNumBaseBenchmarks + kNumBbhPlaybackBenchmarks;
 
@@ skipping 231 matching lines @@
  * Will loop along all skp files and perform measurments.
  *
  * Returns a SkScalar representing CPU time taken during benchmark.
  * As a side effect, it spits the timer result to stdout.
  * Will return -1.0 on error.
  */
 static bool benchmark_loop(
         int argc,
         char **argv,
         const BenchmarkControl& benchControl,
-        Histogram** histogram) {
-
+        SkTArray<Histogram>& histogram) {
     static const SkString timeFormat("%f");
     TimerData timerData(timeFormat, timeFormat);
     for (int index = 1; index < argc; ++index) {
         BenchTimer timer;
         SkString path(argv[index]);
         SkAutoTUnref<SkPicture> pic(pic_from_path(path.c_str()));
         if (NULL == pic) {
             SkDebugf("Couldn't create picture. Ignoring path: %s\n", path.c_str());
             continue;
         }
         benchControl.fFunction(benchControl.fType, benchControl.fTileSize, path, pic, &timer);
         timerData.appendTimes(&timer, argc - 1 == index);
 
-        histogram[index - 1]->fPath = path;
-        histogram[index - 1]->fCpuTime = SkDoubleToScalar(timer.fCpu);
+        histogram[index - 1].fPath = path;
+        histogram[index - 1].fCpuTime = SkDoubleToScalar(timer.fCpu);
     }
 
     const SkString timerResult = timerData.getResult(
             /*logPerIter = */ false,
             /*printMin = */ false,
             /*repeatDraw = */ 1,
             /*configName = */ benchControl.fName.c_str(),
             /*showWallTime = */ false,
             /*showTruncatedWallTime = */ false,
             /*showCpuTime = */ true,
@@ skipping 19 matching lines @@
 int tool_main(int argc, char** argv) {
     SkAutoGraphics ag;
     SkString usage;
     usage.printf("Usage: filename [filename]*\n");
 
     if (argc < 2) {
         SkDebugf("%s\n", usage.c_str());
         return -1;
     }
 
-    Histogram* histograms[kNumBenchmarks];
+    SkTArray<Histogram> histograms[kNumBenchmarks];
 
     for (size_t i = 0; i < kNumBenchmarks; ++i) {
-        histograms[i] = SkNEW_ARRAY(Histogram, argc - 1);
+        histograms[i].reset(argc - 1);
         bool success = benchmark_loop(
                 argc, argv,
                 BenchmarkControl::Make(i),
-                &histograms[i]);
+                histograms[i]);
         if (!success) {
             SkDebugf("benchmark_loop failed at index %d", i);
         }
     }
 
     // Output gnuplot readable histogram data..
     const char* pbTitle = "bbh_shootout_playback.dat";
     const char* recTitle = "bbh_shootout_record.dat";
     SkFILEWStream playbackOut(pbTitle);
     SkFILEWStream recordOut(recTitle);
@@ skipping 36 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