diff options
Diffstat (limited to 'tools/PictureBenchmark.cpp')
-rw-r--r-- | tools/PictureBenchmark.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp index 30967c7381..85a49f4e5e 100644 --- a/tools/PictureBenchmark.cpp +++ b/tools/PictureBenchmark.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "BenchTimer.h" +#include "Timer.h" #include "PictureBenchmark.h" #include "SkCanvas.h" #include "SkPicture.h" @@ -42,13 +42,13 @@ void PictureBenchmark::setTimersToShow(bool wall, fTimerTypes |= gpu ? TimerData::kGpu_Flag : 0; } -BenchTimer* PictureBenchmark::setupTimer(bool useGLTimer) { +Timer* PictureBenchmark::setupTimer(bool useGLTimer) { #if SK_SUPPORT_GPU if (useGLTimer && fRenderer != NULL && fRenderer->isUsingGpuDevice()) { - return SkNEW_ARGS(BenchTimer, (fRenderer->getGLContext())); + return SkNEW_ARGS(Timer, (fRenderer->getGLContext())); } #endif - return SkNEW_ARGS(BenchTimer, (NULL)); + return SkNEW_ARGS(Timer, (NULL)); } PictureRenderer* PictureBenchmark::setRenderer(sk_tools::PictureRenderer* renderer) { @@ -147,11 +147,11 @@ void PictureBenchmark::run(SkPicture* pict) { // seems to cause problems (i.e., INVALID_OPERATIONs) on several // platforms. To work around this, we disable the gpu timer on the // long running timer. - SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer()); + SkAutoTDelete<Timer> longRunningTimer(this->setupTimer()); TimerData longRunningTimerData(numOuterLoops); for (int outer = 0; outer < numOuterLoops; ++outer) { - SkAutoTDelete<BenchTimer> perTileTimer(this->setupTimer(false)); + SkAutoTDelete<Timer> perTileTimer(this->setupTimer(false)); TimerData perTileTimerData(numInnerLoops); longRunningTimer->start(); @@ -201,11 +201,11 @@ void PictureBenchmark::run(SkPicture* pict) { numInnerLoops); } } else { - SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer()); + SkAutoTDelete<Timer> longRunningTimer(this->setupTimer()); TimerData longRunningTimerData(numOuterLoops); for (int outer = 0; outer < numOuterLoops; ++outer) { - SkAutoTDelete<BenchTimer> perRunTimer(this->setupTimer(false)); + SkAutoTDelete<Timer> perRunTimer(this->setupTimer(false)); TimerData perRunTimerData(numInnerLoops); longRunningTimer->start(); |