| Index: third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| index 6d6a25cef00561a7bb4cec5c445b66f2edf666f4..ab490fac4a10cc9218e728fad90f342e92516820 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| @@ -48,11 +48,17 @@ void InspectorTracingAgent::start(ErrorString*,
|
| const Maybe<String>& options,
|
| const Maybe<double>& bufferUsageReportingInterval,
|
| const Maybe<String>& transferMode,
|
| + const Maybe<protocol::Tracing::TraceConfig>& config,
|
| PassOwnPtr<StartCallback> callback)
|
| {
|
| ASSERT(sessionId().isEmpty());
|
| m_state->setString(TracingAgentState::sessionId, IdentifiersFactory::createIdentifier());
|
| - m_client->enableTracing(categories.fromMaybe(String()));
|
| +
|
| + if (config.isJust()) {
|
| + m_client->enableTracingWithConfigStr(config.fromJust()->serialize()->toJSONString());
|
| + } else {
|
| + m_client->enableTracing(categories.fromMaybe(String()));
|
| + }
|
| emitMetadataEvents();
|
| callback->sendSuccess();
|
| }
|
|
|