| Index: base/trace_event/trace_log.cc
|
| diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc
|
| index ae809387932a6f02b3ec21c6004becdb0b5f7a4f..a560a8c5d9d5928fda9c09c09772b7f5d83bd965 100644
|
| --- a/base/trace_event/trace_log.cc
|
| +++ b/base/trace_event/trace_log.cc
|
| @@ -1330,6 +1330,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
|
| }
|
|
|
| void TraceLog::AddMetadataEvent(
|
| + const unsigned char* category_group_enabled,
|
| const char* name,
|
| int num_args,
|
| const char** arg_names,
|
| @@ -1338,14 +1339,16 @@ void TraceLog::AddMetadataEvent(
|
| const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
|
| unsigned int flags) {
|
| scoped_ptr<TraceEvent> trace_event(new TraceEvent);
|
| + int thread_id = static_cast<int>(base::PlatformThread::CurrentId());
|
| + ThreadTicks thread_now = ThreadNow();
|
| + TimeTicks now = OffsetNow();
|
| AutoLock lock(lock_);
|
| trace_event->Initialize(
|
| - 0, // thread_id
|
| - TimeTicks(), ThreadTicks(), TRACE_EVENT_PHASE_METADATA,
|
| - &g_category_group_enabled[g_category_metadata], name,
|
| + thread_id, now, thread_now, TRACE_EVENT_PHASE_METADATA,
|
| + category_group_enabled, name,
|
| trace_event_internal::kGlobalScope, // scope
|
| - trace_event_internal::kNoId, // id
|
| - trace_event_internal::kNoId, // bind_id
|
| + trace_event_internal::kNoId, // id
|
| + trace_event_internal::kNoId, // bind_id
|
| num_args, arg_names, arg_types, arg_values, convertable_values, flags);
|
| metadata_events_.push_back(std::move(trace_event));
|
| }
|
|
|