| 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..6241c617548f1b67108b931cfeb2b31bc6a5387f 100644
|
| --- a/third_party/WebKit/Source/platform/TraceEvent.h
|
| +++ b/third_party/WebKit/Source/platform/TraceEvent.h
|
| @@ -296,6 +296,7 @@ class TraceID final {
|
| public:
|
| class WithScope final {
|
| STACK_ALLOCATED();
|
| +
|
| public:
|
| template<typename T> WithScope(const char* scope, T id)
|
| : m_scope(scope), m_data(reinterpret_cast<unsigned long long>(id)) { }
|
| @@ -308,6 +309,7 @@ public:
|
|
|
| template<bool dummyMangle> class MangleBehavior final {
|
| STACK_ALLOCATED();
|
| +
|
| public:
|
| template<typename T> explicit MangleBehavior(T id) : m_data(reinterpret_cast<unsigned long long>(id)) { }
|
| explicit MangleBehavior(WithScope scopedID) : m_scope(scopedID.scope()), m_data(scopedID.data()) { }
|
| @@ -370,6 +372,7 @@ union TraceValueUnion {
|
| // Simple container for const char* that should be copied instead of retained.
|
| class TraceStringWithCopy {
|
| STACK_ALLOCATED();
|
| +
|
| public:
|
| explicit TraceStringWithCopy(const char* str) : m_str(str) { }
|
| const char* str() const { return m_str; }
|
| @@ -620,7 +623,7 @@ private:
|
| // members of this class instead, compiler warnings occur about potential
|
| // uninitialized accesses.
|
| struct Data {
|
| - DISALLOW_NEW();
|
| + STACK_ALLOCATED();
|
| const unsigned char* categoryGroupEnabled;
|
| const char* name;
|
| TraceEventHandle eventHandle;
|
|
|