Commit c90d58be authored by loislo@chromium.org's avatar loislo@chromium.org

DevTools: tracing: remove state management from InspectorTracingAgent.

Tracing state management happens on the browser side. So the local state does nothing.
Also if DevTools window was closed when tracing was active the next DevTools session had
this flag enabled. So it was not possible to correctly process tracing data because they
had no TracingStartedInPage event. The state used to be necessary when we had console.timeline/timelineEnd implementation.

This test case has been covered by timeline-trivial.html

BUG=420008
R= yurys@chromium.org, caseq@chromium.org, pfeldman@chromium.org

Review URL: https://codereview.chromium.org/638673002

git-svn-id: svn://svn.chromium.org/blink/trunk@183608 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e12ae6f6
...@@ -18,7 +18,6 @@ namespace blink { ...@@ -18,7 +18,6 @@ namespace blink {
namespace TracingAgentState { namespace TracingAgentState {
const char sessionId[] = "sessionId"; const char sessionId[] = "sessionId";
const char tracingStarted[] = "tracingStarted";
} }
namespace { namespace {
...@@ -41,12 +40,7 @@ void InspectorTracingAgent::restore() ...@@ -41,12 +40,7 @@ void InspectorTracingAgent::restore()
void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, const String&, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback) void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, const String&, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback)
{ {
if (m_state->getBoolean(TracingAgentState::tracingStarted)) {
callback->sendSuccess();
return;
}
m_state->setString(TracingAgentState::sessionId, IdentifiersFactory::createIdentifier()); m_state->setString(TracingAgentState::sessionId, IdentifiersFactory::createIdentifier());
m_state->setBoolean(TracingAgentState::tracingStarted, true);
m_client->enableTracing(categoryFilter); m_client->enableTracing(categoryFilter);
emitMetadataEvents(); emitMetadataEvents();
callback->sendSuccess(); callback->sendSuccess();
...@@ -55,7 +49,6 @@ void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, co ...@@ -55,7 +49,6 @@ void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, co
void InspectorTracingAgent::end(ErrorString* errorString, PassRefPtrWillBeRawPtr<EndCallback> callback) void InspectorTracingAgent::end(ErrorString* errorString, PassRefPtrWillBeRawPtr<EndCallback> callback)
{ {
m_client->disableTracing(); m_client->disableTracing();
m_state->setBoolean(TracingAgentState::tracingStarted, false);
m_workerAgent->setTracingSessionId(String()); m_workerAgent->setTracingSessionId(String());
callback->sendSuccess(); callback->sendSuccess();
} }
...@@ -67,8 +60,6 @@ String InspectorTracingAgent::sessionId() ...@@ -67,8 +60,6 @@ String InspectorTracingAgent::sessionId()
void InspectorTracingAgent::emitMetadataEvents() void InspectorTracingAgent::emitMetadataEvents()
{ {
if (!m_state->getBoolean(TracingAgentState::tracingStarted))
return;
TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "sessionId", sessionId().utf8()); TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "sessionId", sessionId().utf8());
if (m_layerTreeId) if (m_layerTreeId)
setLayerTreeId(m_layerTreeId); setLayerTreeId(m_layerTreeId);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment