Index: content/renderer/devtools/devtools_agent.cc |
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc |
index b5d6f9b719fbf7667ba718c00a3304038ef8df34..240efd09713297582ed25289d592a2792ef6f529 100644 |
--- a/content/renderer/devtools/devtools_agent.cc |
+++ b/content/renderer/devtools/devtools_agent.cc |
@@ -141,7 +141,8 @@ bool DevToolsAgent::requestDevToolsForFrame(blink::WebLocalFrame* webFrame) { |
return true; |
} |
-void DevToolsAgent::enableTracing(const WebString& category_filter) { |
+void DevToolsAgent::enableTracingWithTraceConfig( |
+ const base::trace_event::TraceConfig& trace_config) { |
// Tracing is already started by DevTools TracingHandler::Start for the |
// renderer target in the browser process. It will eventually start tracing in |
// the renderer process via IPC. But we still need a redundant |
@@ -149,9 +150,20 @@ void DevToolsAgent::enableTracing(const WebString& category_filter) { |
// InspectorTracingAgent::emitMetadataEvents(), at which point, we are not |
// sure if tracing is already started in the renderer process. |
TraceLog* trace_log = TraceLog::GetInstance(); |
- trace_log->SetEnabled( |
- base::trace_event::TraceConfig(category_filter.utf8(), ""), |
- TraceLog::RECORDING_MODE); |
+ trace_log->SetEnabled(trace_config, TraceLog::RECORDING_MODE); |
+} |
+ |
+void DevToolsAgent::enableTracingWithConfigStr( |
+ const WebString& devtools_style_config) { |
+ base::trace_event::TraceConfig trace_config( |
+ base::trace_event::TraceConfig::DevToolsToTracingStyle( |
+ devtools_style_config.utf8())); |
+ enableTracingWithTraceConfig(trace_config); |
+} |
+ |
+void DevToolsAgent::enableTracing(const WebString& category_filter) { |
+ base::trace_event::TraceConfig trace_config(category_filter.utf8(), ""); |
+ enableTracingWithTraceConfig(trace_config); |
} |
void DevToolsAgent::disableTracing() { |