diff options
| author |  mtklein <mtklein@google.com> | 2014-06-20 10:43:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-20 10:43:07 -0700 |
| commit | 9e64b78ff687edd24c55c0e26942411468032d32 (patch) | |
| tree | dac43280963ee6b72350e706649d750fbb0ea5c5 /debugger | |
| parent | a3530ef268acbbbd84cd4c5465cdc29df5269390 (diff) | |
Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)
Reason for revert:
GpuTimer broken
Original issue's description:
> 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
R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/346753003
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 5cecba273c..1873afca67 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -17,13 +17,13 @@ __SK_FORCE_IMAGE_DECODER_LINKING; #if defined(SK_BUILD_FOR_WIN32) - #include "SysTimer_windows.h" + #include "BenchSysTimer_windows.h" #elif defined(SK_BUILD_FOR_MAC) - #include "SysTimer_mach.h" + #include "BenchSysTimer_mach.h" #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) - #include "SysTimer_posix.h" + #include "BenchSysTimer_posix.h" #else - #include "SysTimer_c.h" + #include "BenchSysTimer_c.h" #endif @@ -202,7 +202,7 @@ public: double totTime() const { return fTot; } protected: - SysTimer fTimer; + BenchSysTimer fTimer; SkTDArray<bool> fSkipCommands; // has the command been deleted in the GUI? SkTDArray<double> fTimes; // sum of time consumed for each command SkTDArray<double> fTypeTimes; // sum of time consumed for each type of command (e.g., drawPath) |