Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: Source/core/inspector/InspectorTracingAgent.cpp

Issue 1092123004: DevTools: remove dependency of most agents on InspectorPageAgent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed debug build Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorTracingAgent.h ('k') | Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "config.h" 7 #include "config.h"
8 8
9 #include "core/inspector/InspectorTracingAgent.h" 9 #include "core/inspector/InspectorTracingAgent.h"
10 10
11 #include "core/inspector/IdentifiersFactory.h" 11 #include "core/inspector/IdentifiersFactory.h"
12 #include "core/inspector/InspectorPageAgent.h"
13 #include "core/inspector/InspectorState.h" 12 #include "core/inspector/InspectorState.h"
14 #include "core/inspector/InspectorTraceEvents.h" 13 #include "core/inspector/InspectorTraceEvents.h"
15 #include "core/inspector/InspectorWorkerAgent.h" 14 #include "core/inspector/InspectorWorkerAgent.h"
16 #include "platform/TraceEvent.h" 15 #include "platform/TraceEvent.h"
17 16
18 namespace blink { 17 namespace blink {
19 18
20 namespace TracingAgentState { 19 namespace TracingAgentState {
21 const char sessionId[] = "sessionId"; 20 const char sessionId[] = "sessionId";
22 } 21 }
23 22
24 namespace { 23 namespace {
25 const char devtoolsMetadataEventCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools .timeline"); 24 const char devtoolsMetadataEventCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools .timeline");
26 } 25 }
27 26
28 InspectorTracingAgent::InspectorTracingAgent(Client* client, InspectorWorkerAgen t* workerAgent, InspectorPageAgent* pageAgent) 27 InspectorTracingAgent::InspectorTracingAgent(LocalFrame* inspectedFrame, Client* client, InspectorWorkerAgent* workerAgent)
29 : InspectorBaseAgent<InspectorTracingAgent, InspectorFrontend::Tracing>("Tra cing") 28 : InspectorBaseAgent<InspectorTracingAgent, InspectorFrontend::Tracing>("Tra cing")
29 , m_inspectedFrame(inspectedFrame)
30 , m_layerTreeId(0) 30 , m_layerTreeId(0)
31 , m_client(client) 31 , m_client(client)
32 , m_workerAgent(workerAgent) 32 , m_workerAgent(workerAgent)
33 , m_pageAgent(pageAgent)
34 { 33 {
35 } 34 }
36 35
37 DEFINE_TRACE(InspectorTracingAgent) 36 DEFINE_TRACE(InspectorTracingAgent)
38 { 37 {
38 visitor->trace(m_inspectedFrame);
39 visitor->trace(m_workerAgent); 39 visitor->trace(m_workerAgent);
40 visitor->trace(m_pageAgent);
41 InspectorBaseAgent::trace(visitor); 40 InspectorBaseAgent::trace(visitor);
42 } 41 }
43 42
44 void InspectorTracingAgent::restore() 43 void InspectorTracingAgent::restore()
45 { 44 {
46 emitMetadataEvents(); 45 emitMetadataEvents();
47 } 46 }
48 47
49 void InspectorTracingAgent::start(ErrorString*, const String* categoryFilter, co nst String*, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback) 48 void InspectorTracingAgent::start(ErrorString*, const String* categoryFilter, co nst String*, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback)
50 { 49 {
(...skipping 11 matching lines...) Expand all
62 callback->sendSuccess(); 61 callback->sendSuccess();
63 } 62 }
64 63
65 String InspectorTracingAgent::sessionId() 64 String InspectorTracingAgent::sessionId()
66 { 65 {
67 return m_state->getString(TracingAgentState::sessionId); 66 return m_state->getString(TracingAgentState::sessionId);
68 } 67 }
69 68
70 void InspectorTracingAgent::emitMetadataEvents() 69 void InspectorTracingAgent::emitMetadataEvents()
71 { 70 {
72 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId (), m_pageAgent->inspectedFrame())); 71 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId (), m_inspectedFrame));
73 if (m_layerTreeId) 72 if (m_layerTreeId)
74 setLayerTreeId(m_layerTreeId); 73 setLayerTreeId(m_layerTreeId);
75 m_workerAgent->setTracingSessionId(sessionId()); 74 m_workerAgent->setTracingSessionId(sessionId());
76 } 75 }
77 76
78 void InspectorTracingAgent::setLayerTreeId(int layerTreeId) 77 void InspectorTracingAgent::setLayerTreeId(int layerTreeId)
79 { 78 {
80 m_layerTreeId = layerTreeId; 79 m_layerTreeId = layerTreeId;
81 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "SetLayerTreeId", TRACE_ EVENT_SCOPE_THREAD, "data", InspectorSetLayerTreeId::data(sessionId(), m_layerTr eeId)); 80 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "SetLayerTreeId", TRACE_ EVENT_SCOPE_THREAD, "data", InspectorSetLayerTreeId::data(sessionId(), m_layerTr eeId));
82 } 81 }
83 82
84 void InspectorTracingAgent::disable(ErrorString*) 83 void InspectorTracingAgent::disable(ErrorString*)
85 { 84 {
86 resetSessionId(); 85 resetSessionId();
87 } 86 }
88 87
89 void InspectorTracingAgent::resetSessionId() 88 void InspectorTracingAgent::resetSessionId()
90 { 89 {
91 m_state->remove(TracingAgentState::sessionId); 90 m_state->remove(TracingAgentState::sessionId);
92 m_workerAgent->setTracingSessionId(sessionId()); 91 m_workerAgent->setTracingSessionId(sessionId());
93 } 92 }
94 93
95 } 94 }
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTracingAgent.h ('k') | Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698