| Index: third_party/WebKit/Source/platform/TraceEvent.h
|
| diff --git a/third_party/WebKit/Source/platform/TraceEvent.h b/third_party/WebKit/Source/platform/TraceEvent.h
|
| index b2d51c05913d706cfeadaa873c662fbde7eee251..c47ac9bb57e52b101515b5984d04796826fe0919 100644
|
| --- a/third_party/WebKit/Source/platform/TraceEvent.h
|
| +++ b/third_party/WebKit/Source/platform/TraceEvent.h
|
| @@ -267,11 +267,11 @@
|
| INTERNAL_TRACE_EVENT_UID(scoped_context)(context.data());
|
|
|
| // These values must be in sync with base::debug::TraceLog::CategoryGroupEnabledFlags.
|
| -#define ENABLED_FOR_RECORDING (1 << 0)
|
| -#define ENABLED_FOR_EVENT_CALLBACK (1 << 2)
|
| +#define INTERNAL_ENABLED_FOR_RECORDING (1 << 0)
|
| +#define INTERNAL_ENABLED_FOR_EVENT_CALLBACK (1 << 2)
|
|
|
| #define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \
|
| - (*INTERNALTRACEEVENTUID(categoryGroupEnabled) & (ENABLED_FOR_RECORDING | ENABLED_FOR_EVENT_CALLBACK))
|
| + (*INTERNALTRACEEVENTUID(categoryGroupEnabled) & (INTERNAL_ENABLED_FOR_RECORDING | INTERNAL_ENABLED_FOR_EVENT_CALLBACK))
|
|
|
| #define INTERNAL_TRACE_MEMORY(category, name)
|
|
|
|
|