Index: base/trace_event/trace_event_impl.cc |
diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc |
index 9ca0ddc3b6075bf78e7818a5ae2038742cb27e43..445cb6db97aad8cedd410c60ef3447ab731c86ce 100644 |
--- a/base/trace_event/trace_event_impl.cc |
+++ b/base/trace_event/trace_event_impl.cc |
@@ -1914,7 +1914,8 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp( |
id ^= process_id_hash_; |
TimeTicks offset_event_timestamp = OffsetTimestamp(timestamp); |
- TimeTicks now = OffsetNow(); |
+ TimeTicks now = flags & TRACE_EVENT_FLAG_EXPLICIT_TIMESTAMP ? |
+ OffsetNow() : offset_event_timestamp; |
TimeTicks thread_now = ThreadNow(); |
ThreadLocalEventBuffer* thread_local_event_buffer = NULL; |
@@ -2035,9 +2036,6 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp( |
} |
} |
- // Use |now| instead of |offset_event_timestamp| to compute overhead, because |
- // event timestamp may be not the real time that we started to add the event |
- // (e.g. event with zero timestamp or that was generated some time ago). |
if (thread_local_event_buffer) |
thread_local_event_buffer->ReportOverhead(now, thread_now); |