Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: tools/bbh_shootout.cpp

Issue 19516006: Add include to fix build, again (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Try again Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/bbh_shootout.cpp
diff --git a/tools/bbh_shootout.cpp b/tools/bbh_shootout.cpp
index b0ef8528adbe2423a7d80456b6f7ba8df6a50a8f..682099b39fd0d7d5944ecf63365fc29872dac3c1 100644
--- a/tools/bbh_shootout.cpp
+++ b/tools/bbh_shootout.cpp
@@ -265,7 +265,7 @@ static bool benchmark_loop(
int argc,
char **argv,
const BenchmarkControl& benchControl,
- SkTArray<Histogram>& histogram) {
+ Histogram** histogram) {
static const SkString timeFormat("%f");
TimerData timerData(timeFormat, timeFormat);
@@ -280,8 +280,8 @@ static bool benchmark_loop(
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(
@@ -320,14 +320,14 @@ static int tool_main(int argc, char** argv) {
return -1;
}
- static SkTArray<Histogram> histograms[kNumBenchmarks];
+ Histogram* histograms[kNumBenchmarks];
for (size_t i = 0; i < kNumBenchmarks; ++i) {
- histograms[i].reset(argc - 1);
+ histograms[i] = SkNEW_ARRAY(Histogram, 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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698