| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 680870372ff237286c5b74507a0808bcf7a5da54..05e7e24e4d256aa783859548e377ffe5c9f2f7ca 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -599,6 +599,8 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) {
|
| OnSetProfilerStatus)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_GetChildProfilerData,
|
| OnGetChildProfilerData)
|
| + IPC_MESSAGE_HANDLER(ChildProcessMsg_OnProfilingPhase,
|
| + OnProfilingPhaseCompletion)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_DumpHandles, OnDumpHandles)
|
| IPC_MESSAGE_HANDLER(ChildProcessMsg_SetProcessBackgrounded,
|
| OnProcessBackgrounded)
|
| @@ -638,14 +640,19 @@ void ChildThreadImpl::OnSetProfilerStatus(ThreadData::Status status) {
|
| ThreadData::InitializeAndSetTrackingStatus(status);
|
| }
|
|
|
| -void ChildThreadImpl::OnGetChildProfilerData(int sequence_number) {
|
| +void ChildThreadImpl::OnGetChildProfilerData(int sequence_number,
|
| + int current_profiling_phase) {
|
| tracked_objects::ProcessDataSnapshot process_data;
|
| - ThreadData::Snapshot(&process_data);
|
| + ThreadData::Snapshot(current_profiling_phase, &process_data);
|
|
|
| Send(
|
| new ChildProcessHostMsg_ChildProfilerData(sequence_number, process_data));
|
| }
|
|
|
| +void ChildThreadImpl::OnProfilingPhaseCompletion(int profiling_phase) {
|
| + ThreadData::OnProfilingPhaseCompletion(profiling_phase);
|
| +}
|
| +
|
| void ChildThreadImpl::OnDumpHandles() {
|
| #if defined(OS_WIN)
|
| scoped_refptr<HandleEnumerator> handle_enum(
|
|
|