| Index: skia/ext/event_tracer_impl.cc
|
| diff --git a/skia/ext/event_tracer_impl.cc b/skia/ext/event_tracer_impl.cc
|
| index e28381450865ba93665a02e248886c7c6ec7b337..f6e12f05d605a198d7777bbcda02162b17d220db 100644
|
| --- a/skia/ext/event_tracer_impl.cc
|
| +++ b/skia/ext/event_tracer_impl.cc
|
| @@ -32,8 +32,7 @@ const uint8_t*
|
|
|
| const char* SkChromiumEventTracer::getCategoryGroupName(
|
| const uint8_t* categoryEnabledFlag) {
|
| - return base::debug::TraceLog::GetCategoryGroupName(
|
| - categoryEnabledFlag);
|
| + return base::trace_event::TraceLog::GetCategoryGroupName(categoryEnabledFlag);
|
| }
|
|
|
| SkEventTracer::Handle
|
| @@ -46,9 +45,9 @@ SkEventTracer::Handle
|
| const uint8_t* argTypes,
|
| const uint64_t* argValues,
|
| uint8_t flags) {
|
| - base::debug::TraceEventHandle handle = TRACE_EVENT_API_ADD_TRACE_EVENT(
|
| - phase, categoryEnabledFlag, name, id, numArgs, argNames,
|
| - argTypes, (const long long unsigned int*) argValues, NULL, flags);
|
| + base::trace_event::TraceEventHandle handle = TRACE_EVENT_API_ADD_TRACE_EVENT(
|
| + phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes,
|
| + (const long long unsigned int*)argValues, NULL, flags);
|
| SkEventTracer::Handle result;
|
| memcpy(&result, &handle, sizeof(result));
|
| return result;
|
| @@ -59,7 +58,7 @@ void
|
| const uint8_t* categoryEnabledFlag,
|
| const char *name,
|
| SkEventTracer::Handle handle) {
|
| - base::debug::TraceEventHandle traceEventHandle;
|
| + base::trace_event::TraceEventHandle traceEventHandle;
|
| memcpy(&traceEventHandle, &handle, sizeof(handle));
|
| TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(
|
| categoryEnabledFlag, name, traceEventHandle);
|
|
|