| Index: base/debug/trace_event.cc
|
| diff --git a/base/debug/trace_event.cc b/base/debug/trace_event.cc
|
| index 347644f982ef3a4f3cd260b55a8b452e5217db3e..9e44096935116d45d3339d50f67adcaff48a560a 100644
|
| --- a/base/debug/trace_event.cc
|
| +++ b/base/debug/trace_event.cc
|
| @@ -118,22 +118,6 @@ void TraceValue::AppendAsJSON(std::string* out) const {
|
|
|
| namespace {
|
|
|
| -const char* GetPhaseStr(TraceEventPhase phase) {
|
| - switch(phase) {
|
| - case TRACE_EVENT_PHASE_BEGIN:
|
| - return "B";
|
| - case TRACE_EVENT_PHASE_INSTANT:
|
| - return "I";
|
| - case TRACE_EVENT_PHASE_END:
|
| - return "E";
|
| - case TRACE_EVENT_PHASE_METADATA:
|
| - return "M";
|
| - default:
|
| - NOTREACHED() << "Invalid phase argument";
|
| - return "?";
|
| - }
|
| -}
|
| -
|
| size_t GetAllocLength(const char* str) { return str ? strlen(str) + 1 : 0; }
|
|
|
| // Copies |*member| into |*buffer|, sets |*member| to point to this new
|
| @@ -220,6 +204,38 @@ TraceEvent::TraceEvent(unsigned long process_id,
|
| TraceEvent::~TraceEvent() {
|
| }
|
|
|
| +const char* TraceEvent::GetPhaseStr(TraceEventPhase phase) {
|
| + switch(phase) {
|
| + case TRACE_EVENT_PHASE_BEGIN:
|
| + return "B";
|
| + case TRACE_EVENT_PHASE_INSTANT:
|
| + return "I";
|
| + case TRACE_EVENT_PHASE_END:
|
| + return "E";
|
| + case TRACE_EVENT_PHASE_METADATA:
|
| + return "M";
|
| + default:
|
| + NOTREACHED() << "Invalid phase argument";
|
| + return "?";
|
| + }
|
| +}
|
| +
|
| +TraceEventPhase TraceEvent::GetPhase(const char* phase) {
|
| + switch(*phase) {
|
| + case 'B':
|
| + return TRACE_EVENT_PHASE_BEGIN;
|
| + case 'I':
|
| + return TRACE_EVENT_PHASE_INSTANT;
|
| + case 'E':
|
| + return TRACE_EVENT_PHASE_END;
|
| + case 'M':
|
| + return TRACE_EVENT_PHASE_METADATA;
|
| + default:
|
| + NOTREACHED() << "Invalid phase name";
|
| + return TRACE_EVENT_PHASE_METADATA;
|
| + }
|
| +}
|
| +
|
| void TraceEvent::AppendEventsAsJSON(const std::vector<TraceEvent>& events,
|
| size_t start,
|
| size_t count,
|
|
|