diff options
author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 21:48:17 +0000 |
---|---|---|
committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 21:48:17 +0000 |
commit | dc69c927cc3531871721f43f498113d3bdacbc21 (patch) | |
tree | 0c44740edade4e67cf1b659727287840e65c0673 /base/debug | |
parent | 690679e143ba9762ba4cbd2721a922e914189116 (diff) | |
download | chromium_src-dc69c927cc3531871721f43f498113d3bdacbc21.zip chromium_src-dc69c927cc3531871721f43f498113d3bdacbc21.tar.gz chromium_src-dc69c927cc3531871721f43f498113d3bdacbc21.tar.bz2 |
Remove temporary code after migration of Platform::updateTraceEventDuration
BUG=none
Review URL: https://codereview.chromium.org/79373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r-- | base/debug/trace_event_impl.cc | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index ad7c9ac..23d2527 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -1930,15 +1930,12 @@ void TraceLog::UpdateTraceEventDuration( const unsigned char* category_group_enabled, const char* name, TraceEventHandle handle) { - OptionalAutoLock lock(lock_); - TimeTicks now = OffsetNow(); - TraceEvent* trace_event = NULL; - // TODO(wangxianzhu): Remove the !category_group_enabled condition after - // all clients migrate to the new UpdateTraceEventDuration API. - if (!category_group_enabled || - (*category_group_enabled & ENABLED_FOR_RECORDING)) { - trace_event = GetEventByHandleInternal(handle, &lock); + + if (*category_group_enabled & ENABLED_FOR_RECORDING) { + OptionalAutoLock lock(lock_); + + TraceEvent* trace_event = GetEventByHandleInternal(handle, &lock); if (trace_event) { DCHECK(trace_event->phase() == TRACE_EVENT_PHASE_COMPLETE); trace_event->UpdateDuration(now); @@ -1953,16 +1950,6 @@ void TraceLog::UpdateTraceEventDuration( } } - // TODO(wangxianzhu): Remove this block after all clients migrate to the - // new UpdateTraceEventDuration API. - if (!category_group_enabled || !name) { - if (!trace_event) - return; - category_group_enabled = trace_event->category_group_enabled(); - name = trace_event->name(); - } - - lock.EnsureReleased(); if (*category_group_enabled & ENABLED_FOR_EVENT_CALLBACK) { EventCallback event_callback = reinterpret_cast<EventCallback>( subtle::NoBarrier_Load(&event_callback_)); |