Index: trunk/src/content/browser/tracing/trace_message_filter.cc |
=================================================================== |
--- trunk/src/content/browser/tracing/trace_message_filter.cc (revision 237451) |
+++ trunk/src/content/browser/tracing/trace_message_filter.cc (working copy) |
@@ -5,6 +5,7 @@ |
#include "content/browser/tracing/trace_message_filter.h" |
#include "components/tracing/tracing_messages.h" |
+#include "content/browser/tracing/trace_controller_impl.h" |
#include "content/browser/tracing/tracing_controller_impl.h" |
namespace content { |
@@ -16,8 +17,6 @@ |
is_awaiting_buffer_percent_full_ack_(false) { |
} |
-TraceMessageFilter::~TraceMessageFilter() {} |
- |
void TraceMessageFilter::OnChannelClosing() { |
if (has_child_) { |
if (is_awaiting_end_ack_) |
@@ -29,7 +28,8 @@ |
if (is_awaiting_buffer_percent_full_ack_) |
OnTraceBufferPercentFullReply(0.0f); |
- TracingControllerImpl::GetInstance()->RemoveTraceMessageFilter(this); |
+ TraceControllerImpl::GetInstance()->RemoveFilter(this); |
+ TracingControllerImpl::GetInstance()->RemoveFilter(this); |
} |
} |
@@ -47,8 +47,8 @@ |
OnTraceDataCollected) |
IPC_MESSAGE_HANDLER(TracingHostMsg_MonitoringTraceDataCollected, |
OnMonitoringTraceDataCollected) |
- IPC_MESSAGE_HANDLER(TracingHostMsg_WatchEventMatched, |
- OnWatchEventMatched) |
+ IPC_MESSAGE_HANDLER(TracingHostMsg_TraceNotification, |
+ OnTraceNotification) |
IPC_MESSAGE_HANDLER(TracingHostMsg_TraceBufferPercentFullReply, |
OnTraceBufferPercentFullReply) |
IPC_MESSAGE_UNHANDLED(handled = false) |
@@ -109,9 +109,12 @@ |
Send(new TracingMsg_CancelWatchEvent); |
} |
+TraceMessageFilter::~TraceMessageFilter() {} |
+ |
void TraceMessageFilter::OnChildSupportsTracing() { |
has_child_ = true; |
- TracingControllerImpl::GetInstance()->AddTraceMessageFilter(this); |
+ TraceControllerImpl::GetInstance()->AddFilter(this); |
+ TracingControllerImpl::GetInstance()->AddFilter(this); |
} |
void TraceMessageFilter::OnEndTracingAck( |
@@ -120,6 +123,7 @@ |
// child process is compromised. |
if (is_awaiting_end_ack_) { |
is_awaiting_end_ack_ = false; |
+ TraceControllerImpl::GetInstance()->OnEndTracingAck(known_categories); |
TracingControllerImpl::GetInstance()->OnDisableRecordingAcked( |
known_categories); |
} else { |
@@ -141,6 +145,7 @@ |
void TraceMessageFilter::OnTraceDataCollected(const std::string& data) { |
scoped_refptr<base::RefCountedString> data_ptr(new base::RefCountedString()); |
data_ptr->data() = data; |
+ TraceControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr); |
TracingControllerImpl::GetInstance()->OnTraceDataCollected(data_ptr); |
} |
@@ -152,13 +157,15 @@ |
data_ptr); |
} |
-void TraceMessageFilter::OnWatchEventMatched() { |
- TracingControllerImpl::GetInstance()->OnWatchEventMatched(); |
+void TraceMessageFilter::OnTraceNotification(int notification) { |
+ TraceControllerImpl::GetInstance()->OnTraceNotification(notification); |
} |
void TraceMessageFilter::OnTraceBufferPercentFullReply(float percent_full) { |
if (is_awaiting_buffer_percent_full_ack_) { |
is_awaiting_buffer_percent_full_ack_ = false; |
+ TraceControllerImpl::GetInstance()->OnTraceBufferPercentFullReply( |
+ percent_full); |
TracingControllerImpl::GetInstance()->OnTraceBufferPercentFullReply( |
percent_full); |
} else { |