diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-20 11:29:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-20 11:29:21 -0700 |
| commit | 9ac68ee2594f28dfc1bd16a4bf004b1a4f6f228d (patch) | |
| tree | 01874abc7df6a4840e9b1763e156842c7faba0c2 /tools/bbh_shootout.cpp | |
| parent | 24480bc71ef6c754030cb3f98672da1c8fb3a63b (diff) | |
Move BenchTimer to tools as Timer
This breaks a bunch of circular dependencies between tools and gm and bench.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed
CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Debug-iOS-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
R=tfarina@chromium.org, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/344213003
Diffstat (limited to 'tools/bbh_shootout.cpp')
| -rw-r--r-- | tools/bbh_shootout.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/bbh_shootout.cpp b/tools/bbh_shootout.cpp index e657917aad..64fc6d87d8 100644 --- a/tools/bbh_shootout.cpp +++ b/tools/bbh_shootout.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "BenchTimer.h" +#include "Timer.h" #include "Benchmark.h" #include "LazyDecodeBitmap.h" #include "PictureBenchmark.h" @@ -64,7 +64,7 @@ static void do_benchmark_work(sk_tools::PictureRenderer* renderer, BBoxType bBoxType, SkPicture* pic, const int numRepeats, - BenchTimer* timer) { + Timer* timer) { renderer->setBBoxHierarchyType(bBoxType); renderer->setGridSize(FLAGS_tilesize, FLAGS_tilesize); renderer->init(pic, NULL, NULL, NULL, false); @@ -106,14 +106,14 @@ int tool_main(int argc, char** argv) { if (!includeBBoxType[bBoxType]) { continue; } if (FLAGS_playback > 0) { sk_tools::TiledPictureRenderer playbackRenderer; - BenchTimer playbackTimer; + Timer playbackTimer; do_benchmark_work(&playbackRenderer, (BBoxType)bBoxType, picture, FLAGS_playback, &playbackTimer); measurement.fPlaybackAverage[bBoxType] = playbackTimer.fCpu; } if (FLAGS_record > 0) { sk_tools::RecordPictureRenderer recordRenderer; - BenchTimer recordTimer; + Timer recordTimer; do_benchmark_work(&recordRenderer, (BBoxType)bBoxType, picture, FLAGS_record, &recordTimer); measurement.fRecordAverage[bBoxType] = recordTimer.fCpu; |