| OLD | NEW |
| 1 // | 1 // |
| 2 // Copyright 2014 The Chromium Authors. All rights reserved. | 2 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
| 4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
| 5 // | 5 // |
| 6 | 6 |
| 7 #include "core/inspector/InspectorTracingAgent.h" | 7 #include "core/inspector/InspectorTracingAgent.h" |
| 8 | 8 |
| 9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
| 10 #include "core/inspector/IdentifiersFactory.h" | 10 #include "core/inspector/IdentifiersFactory.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 void InspectorTracingAgent::end(ErrorString* errorString, PassOwnPtr<EndCallback
> callback) | 60 void InspectorTracingAgent::end(ErrorString* errorString, PassOwnPtr<EndCallback
> callback) |
| 61 { | 61 { |
| 62 m_client->disableTracing(); | 62 m_client->disableTracing(); |
| 63 resetSessionId(); | 63 resetSessionId(); |
| 64 callback->sendSuccess(); | 64 callback->sendSuccess(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 String InspectorTracingAgent::sessionId() | 67 String InspectorTracingAgent::sessionId() |
| 68 { | 68 { |
| 69 String result; | 69 String16 result; |
| 70 if (m_state) | 70 if (m_state) |
| 71 m_state->getString(TracingAgentState::sessionId, &result); | 71 m_state->getString(TracingAgentState::sessionId, &result); |
| 72 return result; | 72 return result; |
| 73 } | 73 } |
| 74 | 74 |
| 75 void InspectorTracingAgent::emitMetadataEvents() | 75 void InspectorTracingAgent::emitMetadataEvents() |
| 76 { | 76 { |
| 77 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage",
TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId
(), m_inspectedFrames->root())); | 77 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage",
TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId
(), m_inspectedFrames->root())); |
| 78 if (m_layerTreeId) | 78 if (m_layerTreeId) |
| 79 setLayerTreeId(m_layerTreeId); | 79 setLayerTreeId(m_layerTreeId); |
| 80 m_workerAgent->setTracingSessionId(sessionId()); | 80 m_workerAgent->setTracingSessionId(sessionId()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void InspectorTracingAgent::setLayerTreeId(int layerTreeId) | 83 void InspectorTracingAgent::setLayerTreeId(int layerTreeId) |
| 84 { | 84 { |
| 85 m_layerTreeId = layerTreeId; | 85 m_layerTreeId = layerTreeId; |
| 86 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "SetLayerTreeId", TRACE_
EVENT_SCOPE_THREAD, "data", InspectorSetLayerTreeId::data(sessionId(), m_layerTr
eeId)); | 86 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "SetLayerTreeId", TRACE_
EVENT_SCOPE_THREAD, "data", InspectorSetLayerTreeId::data(sessionId(), m_layerTr
eeId)); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void InspectorTracingAgent::disable(ErrorString*) | 89 void InspectorTracingAgent::disable(ErrorString*) |
| 90 { | 90 { |
| 91 resetSessionId(); | 91 resetSessionId(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 void InspectorTracingAgent::resetSessionId() | 94 void InspectorTracingAgent::resetSessionId() |
| 95 { | 95 { |
| 96 m_state->remove(TracingAgentState::sessionId); | 96 m_state->remove(TracingAgentState::sessionId); |
| 97 m_workerAgent->setTracingSessionId(sessionId()); | 97 m_workerAgent->setTracingSessionId(String()); |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace blink | 100 } // namespace blink |
| OLD | NEW |