| Index: third_party/WebKit/Source/platform/EventTracer.h
|
| diff --git a/third_party/WebKit/Source/platform/EventTracer.h b/third_party/WebKit/Source/platform/EventTracer.h
|
| index d6a4ca85b74f43ced08ef2d05c09f030823d1411..6d812e650cb26de13e4f84bfbc14bb13c0509edf 100644
|
| --- a/third_party/WebKit/Source/platform/EventTracer.h
|
| +++ b/third_party/WebKit/Source/platform/EventTracer.h
|
| @@ -53,17 +53,11 @@ class TraceEventMemoryOverhead;
|
|
|
| namespace blink {
|
|
|
| +class TracedValue;
|
| +
|
| namespace TraceEvent {
|
| typedef uint64_t TraceEventHandle;
|
| typedef intptr_t TraceEventAPIAtomicWord;
|
| -
|
| -class PLATFORM_EXPORT ConvertableToTraceFormat : public RefCounted<ConvertableToTraceFormat> {
|
| -public:
|
| - virtual String asTraceFormat() const = 0;
|
| - virtual ~ConvertableToTraceFormat() { }
|
| - virtual void estimateTraceMemoryOverhead(base::trace_event::TraceEventMemoryOverhead*) { }
|
| -};
|
| -
|
| } // namespace TraceEvent
|
|
|
| // FIXME: Make these global variables thread-safe. Make a value update atomic.
|
| @@ -84,8 +78,8 @@ public:
|
| const char* argNames[],
|
| const unsigned char argTypes[],
|
| const unsigned long long argValues[],
|
| - PassRefPtr<TraceEvent::ConvertableToTraceFormat>,
|
| - PassRefPtr<TraceEvent::ConvertableToTraceFormat>,
|
| + PassRefPtr<TracedValue>,
|
| + PassRefPtr<TracedValue>,
|
| unsigned flags);
|
| static TraceEvent::TraceEventHandle addTraceEvent(char phase,
|
| const unsigned char* categoryEnabledFlag,
|
|
|