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 /cc/scheduler | |
| 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 'cc/scheduler')
| -rw-r--r-- | cc/scheduler/begin_frame_tracker.cc | 17 | ||||
| -rw-r--r-- | cc/scheduler/begin_frame_tracker.h | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/cc/scheduler/begin_frame_tracker.cc b/cc/scheduler/begin_frame_tracker.cc index 3b526cc..20e2c39 100644 --- a/cc/scheduler/begin_frame_tracker.cc +++ b/cc/scheduler/begin_frame_tracker.cc @@ -11,8 +11,7 @@ BeginFrameTracker::BeginFrameTracker(const tracked_objects::Location& location) location_string_(location.ToString()), current_updated_at_(), current_args_(), - current_finished_at_(base::TraceTicks::FromInternalValue(-1)) { -} + current_finished_at_(base::TimeTicks::FromInternalValue(-1)) {} BeginFrameTracker::~BeginFrameTracker() { } @@ -35,9 +34,9 @@ void BeginFrameTracker::Start(BeginFrameArgs new_args) { DCHECK(HasFinished()) << "Tried to start a new frame before finishing an existing frame."; - current_updated_at_ = base::TraceTicks::Now(); + current_updated_at_ = base::TimeTicks::Now(); current_args_ = new_args; - current_finished_at_ = base::TraceTicks(); + current_finished_at_ = base::TimeTicks(); // TODO(mithro): Add UMA tracking of delta between current_updated_at_ time // and the new_args.frame_time argument. This will give us how long after a @@ -54,7 +53,7 @@ const BeginFrameArgs& BeginFrameTracker::Current() const { void BeginFrameTracker::Finish() { DCHECK(!HasFinished()) << "Tried to finish an already finished frame"; - current_finished_at_ = base::TraceTicks::Now(); + current_finished_at_ = base::TimeTicks::Now(); TRACE_EVENT_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.scheduler.frames"), location_string_.c_str(), current_args_.frame_time.ToInternalValue()); @@ -81,10 +80,10 @@ base::TimeDelta BeginFrameTracker::Interval() const { void BeginFrameTracker::AsValueInto( base::TimeTicks now, base::trace_event::TracedValue* state) const { - state->SetInteger("updated_at_us", (current_updated_at_ - base::TraceTicks()) - .InMicroseconds()); - state->SetInteger("finished_at_us", (current_finished_at_ - - base::TraceTicks()).InMicroseconds()); + state->SetInteger("updated_at_us", + (current_updated_at_ - base::TimeTicks()).InMicroseconds()); + state->SetInteger("finished_at_us", (current_finished_at_ - base::TimeTicks()) + .InMicroseconds()); if (HasFinished()) { state->SetString("state", "FINISHED"); state->BeginDictionary("current_args_"); diff --git a/cc/scheduler/begin_frame_tracker.h b/cc/scheduler/begin_frame_tracker.h index 617f52b..98b1da4 100644 --- a/cc/scheduler/begin_frame_tracker.h +++ b/cc/scheduler/begin_frame_tracker.h @@ -87,9 +87,9 @@ class CC_EXPORT BeginFrameTracker { const tracked_objects::Location location_; const std::string location_string_; - base::TraceTicks current_updated_at_; + base::TimeTicks current_updated_at_; BeginFrameArgs current_args_; - base::TraceTicks current_finished_at_; + base::TimeTicks current_finished_at_; }; } // namespace cc |