Index: content/child/child_thread_impl.cc |
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc |
index 013d1d51302d1920edcbe76ec7b463357789c8f5..0a1964b230b19db220c306dd182927c7fb228c63 100644 |
--- a/content/child/child_thread_impl.cc |
+++ b/content/child/child_thread_impl.cc |
@@ -609,6 +609,8 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) { |
OnSetProfilerStatus) |
IPC_MESSAGE_HANDLER(ChildProcessMsg_GetChildProfilerData, |
OnGetChildProfilerData) |
+ IPC_MESSAGE_HANDLER(ChildProcessMsg_ProfilingPhaseCompleted, |
+ OnProfilingPhaseCompleted) |
IPC_MESSAGE_HANDLER(ChildProcessMsg_DumpHandles, OnDumpHandles) |
IPC_MESSAGE_HANDLER(ChildProcessMsg_SetProcessBackgrounded, |
OnProcessBackgrounded) |
@@ -648,14 +650,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::OnProfilingPhaseCompleted(int profiling_phase) { |
+ ThreadData::OnProfilingPhaseCompleted(profiling_phase); |
+} |
+ |
void ChildThreadImpl::OnDumpHandles() { |
#if defined(OS_WIN) |
scoped_refptr<HandleEnumerator> handle_enum( |