| Index: content/child/blink_platform_impl.cc
|
| diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
|
| index 41f46d498aef84c6e91b511b56d3941261746e2c..7933a13cdcdad56be8a1582c61d4bb6d7a904272 100644
|
| --- a/content/child/blink_platform_impl.cc
|
| +++ b/content/child/blink_platform_impl.cc
|
| @@ -639,8 +639,7 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
|
| base::trace_event::TraceEventHandle handle =
|
| TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
|
| phase, category_group_enabled, name, id,
|
| - base::PlatformThread::CurrentId(),
|
| - timestamp_tt,
|
| + base::PlatformThread::CurrentId(), trace_event_internal::kNoId, timestamp_tt,
|
| num_args, arg_names, arg_types, arg_values, NULL, flags);
|
| blink::Platform::TraceEventHandle result;
|
| memcpy(&result, &handle, sizeof(result));
|
| @@ -674,18 +673,10 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
|
| base::TraceTicks timestamp_tt =
|
| base::TraceTicks() + base::TimeDelta::FromSecondsD(timestamp);
|
| base::trace_event::TraceEventHandle handle =
|
| - TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(phase,
|
| - category_group_enabled,
|
| - name,
|
| - id,
|
| - base::PlatformThread::CurrentId(),
|
| - timestamp_tt,
|
| - num_args,
|
| - arg_names,
|
| - arg_types,
|
| - arg_values,
|
| - convertable_wrappers,
|
| - flags);
|
| + TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
|
| + phase, category_group_enabled, name, id,
|
| + base::PlatformThread::CurrentId(), trace_event_internal::kNoId, timestamp_tt,
|
| + num_args, arg_names, arg_types, arg_values, convertable_wrappers, flags);
|
| blink::Platform::TraceEventHandle result;
|
| memcpy(&result, &handle, sizeof(result));
|
| return result;
|
|
|