| Index: content/common/child_process_messages.h
|
| diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
|
| index 948b60ed49a1192a59b0b201bc4c61cf4c6633c5..defaeaf0dd43ac5b6c4dfee9721f15b29e1d926d 100644
|
| --- a/content/common/child_process_messages.h
|
| +++ b/content/common/child_process_messages.h
|
| @@ -51,9 +51,13 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ParentChildPairSnapshot)
|
| IPC_STRUCT_TRAITS_MEMBER(child)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot)
|
| +IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataPhaseSnapshot)
|
| IPC_STRUCT_TRAITS_MEMBER(tasks)
|
| IPC_STRUCT_TRAITS_MEMBER(descendants)
|
| + IPC_STRUCT_TRAITS_END()
|
| +
|
| + IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot)
|
| + IPC_STRUCT_TRAITS_MEMBER(phased_process_data_snapshots)
|
| IPC_STRUCT_TRAITS_MEMBER(process_id)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| @@ -98,8 +102,14 @@ IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProfilerStatus,
|
|
|
| // Send to all the child processes to send back profiler data (ThreadData in
|
| // tracked_objects).
|
| -IPC_MESSAGE_CONTROL1(ChildProcessMsg_GetChildProfilerData,
|
| - int /* sequence_number */)
|
| +IPC_MESSAGE_CONTROL2(ChildProcessMsg_GetChildProfilerData,
|
| + int /* sequence_number */,
|
| + int /* profiling_phase */)
|
| +
|
| +// Send to all the child processes to send back profiler data (ThreadData in
|
| +// tracked_objects).
|
| +IPC_MESSAGE_CONTROL1(ChildProcessMsg_OnProfilingPhase,
|
| + int /* profiling_phase */)
|
|
|
| // Send to all the child processes to send back histogram data.
|
| IPC_MESSAGE_CONTROL1(ChildProcessMsg_GetChildHistogramData,
|
| @@ -123,9 +133,10 @@ IPC_MESSAGE_CONTROL0(ChildProcessMsg_GetTcmallocStats)
|
| IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ShutdownRequest)
|
|
|
| // Send back profiler data (ThreadData in tracked_objects).
|
| -IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildProfilerData,
|
| - int, /* sequence_number */
|
| - tracked_objects::ProcessDataSnapshot /* profiler_data */)
|
| +IPC_MESSAGE_CONTROL2(
|
| + ChildProcessHostMsg_ChildProfilerData,
|
| + int, /* sequence_number */
|
| + tracked_objects::ProcessDataSnapshot /* process_data_snapshot */)
|
|
|
| // Send back histograms as vector of pickled-histogram strings.
|
| IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildHistogramData,
|
|
|