| 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 510cc2ffac6b32add118eb53ed4147b4b70369d9..349e54ebc7a4ebd4d9d4be380a0442c21949d617 100644
|
| --- a/base/trace_event/trace_event_impl.cc
|
| +++ b/base/trace_event/trace_event_impl.cc
|
| @@ -358,10 +358,15 @@ void TraceEvent::AppendAsJSON(
|
|
|
| // If id_ is set, print it out as a hex string so we don't loose any
|
| // bits (it might be a 64-bit pointer).
|
| - if (flags_ & TRACE_EVENT_FLAG_HAS_ID) {
|
| + unsigned int id_flags = flags_ & TRACE_EVENT_FLAG_ID_MASK;
|
| + if (id_flags != TRACE_EVENT_FLAG_NONE) {
|
| if (scope_ != trace_event_internal::kGlobalScope)
|
| StringAppendF(out, ",\"scope\":\"%s\"", scope_);
|
| StringAppendF(out, ",\"id\":\"0x%" PRIx64 "\"", static_cast<uint64_t>(id_));
|
| + if (id_flags == TRACE_EVENT_FLAG_HAS_LOCAL_ID)
|
| + *out += ",\"id_is_global\":false";
|
| + if (id_flags == TRACE_EVENT_FLAG_HAS_GLOBAL_ID)
|
| + *out += ",\"id_is_global\":true";
|
| }
|
|
|
| if (flags_ & TRACE_EVENT_FLAG_BIND_TO_ENCLOSING)
|
|
|