diff options
| author | charliea <charliea@chromium.org> | 2015-11-05 05:48:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 13:49:48 +0000 |
| commit | 2bccc2cf38624593e1adafefccec7314aa573b0f (patch) | |
| tree | 9d59cac140bc520a3099966457c5cf481e9a1741 /gpu/perftests | |
| parent | 1f548985bfeaacd0aa4b782c629d1ecbc29173c7 (diff) | |
| download | chromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.zip chromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.tar.gz chromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.tar.bz2 | |
Kills TraceTicks, which was functionally the same as TimeTicks
This was not true until last week's submission of
http://crrev.com/1374753004.
BUG=541692
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
NO_PRESUBMIT=true
Review URL: https://codereview.chromium.org/1424703003
Cr-Commit-Position: refs/heads/master@{#358047}
Diffstat (limited to 'gpu/perftests')
| -rw-r--r-- | gpu/perftests/measurements.cc | 4 | ||||
| -rw-r--r-- | gpu/perftests/measurements.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gpu/perftests/measurements.cc b/gpu/perftests/measurements.cc index 645784d..8909b28 100644 --- a/gpu/perftests/measurements.cc +++ b/gpu/perftests/measurements.cc @@ -55,7 +55,7 @@ Measurement::~Measurement() { MeasurementTimers::MeasurementTimers(gfx::GPUTimingClient* gpu_timing_client) : wall_time_start_(), cpu_time_start_(), gpu_timer_() { DCHECK(gpu_timing_client); - wall_time_start_ = base::TraceTicks::Now(); + wall_time_start_ = base::TimeTicks::Now(); if (base::ThreadTicks::IsSupported()) { base::ThreadTicks::WaitUntilInitialized(); cpu_time_start_ = base::ThreadTicks::Now(); @@ -72,7 +72,7 @@ MeasurementTimers::MeasurementTimers(gfx::GPUTimingClient* gpu_timing_client) } void MeasurementTimers::Record() { - wall_time_ = base::TraceTicks::Now() - wall_time_start_; + wall_time_ = base::TimeTicks::Now() - wall_time_start_; if (base::ThreadTicks::IsSupported()) { cpu_time_ = base::ThreadTicks::Now() - cpu_time_start_; } diff --git a/gpu/perftests/measurements.h b/gpu/perftests/measurements.h index 724baa4..e0d9de3 100644 --- a/gpu/perftests/measurements.h +++ b/gpu/perftests/measurements.h @@ -47,7 +47,7 @@ class MeasurementTimers { ~MeasurementTimers(); private: - base::TraceTicks wall_time_start_; + base::TimeTicks wall_time_start_; base::ThreadTicks cpu_time_start_; scoped_ptr<gfx::GPUTimer> gpu_timer_; |