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

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

Issue 657383002: DevTools: clear session id. follow-up patch after r183608 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 6 years, 2 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') | no next file » | 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
(...skipping 22 matching lines...) Expand all
33 { 33 {
34 } 34 }
35 35
36 void InspectorTracingAgent::restore() 36 void InspectorTracingAgent::restore()
37 { 37 {
38 emitMetadataEvents(); 38 emitMetadataEvents();
39 } 39 }
40 40
41 void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, co nst String&, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback) 41 void InspectorTracingAgent::start(ErrorString*, const String& categoryFilter, co nst String&, const double*, PassRefPtrWillBeRawPtr<StartCallback> callback)
42 { 42 {
43 ASSERT(m_state->getString(TracingAgentState::sessionId).isEmpty());
43 m_state->setString(TracingAgentState::sessionId, IdentifiersFactory::createI dentifier()); 44 m_state->setString(TracingAgentState::sessionId, IdentifiersFactory::createI dentifier());
44 m_client->enableTracing(categoryFilter); 45 m_client->enableTracing(categoryFilter);
45 emitMetadataEvents(); 46 emitMetadataEvents();
46 callback->sendSuccess(); 47 callback->sendSuccess();
47 } 48 }
48 49
49 void InspectorTracingAgent::end(ErrorString* errorString, PassRefPtrWillBeRawPtr <EndCallback> callback) 50 void InspectorTracingAgent::end(ErrorString* errorString, PassRefPtrWillBeRawPtr <EndCallback> callback)
50 { 51 {
52 m_state->remove(TracingAgentState::sessionId);
51 m_client->disableTracing(); 53 m_client->disableTracing();
52 m_workerAgent->setTracingSessionId(String()); 54 m_workerAgent->setTracingSessionId(String());
53 callback->sendSuccess(); 55 callback->sendSuccess();
54 } 56 }
55 57
56 String InspectorTracingAgent::sessionId() 58 String InspectorTracingAgent::sessionId()
57 { 59 {
58 return m_state->getString(TracingAgentState::sessionId); 60 return m_state->getString(TracingAgentState::sessionId);
59 } 61 }
60 62
61 void InspectorTracingAgent::emitMetadataEvents() 63 void InspectorTracingAgent::emitMetadataEvents()
62 { 64 {
63 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "sessionId", sessionId().utf8()); 65 TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "sessionId", sessionId().utf8());
64 if (m_layerTreeId) 66 if (m_layerTreeId)
65 setLayerTreeId(m_layerTreeId); 67 setLayerTreeId(m_layerTreeId);
66 m_workerAgent->setTracingSessionId(sessionId()); 68 m_workerAgent->setTracingSessionId(sessionId());
67 } 69 }
68 70
69 void InspectorTracingAgent::setLayerTreeId(int layerTreeId) 71 void InspectorTracingAgent::setLayerTreeId(int layerTreeId)
70 { 72 {
71 m_layerTreeId = layerTreeId; 73 m_layerTreeId = layerTreeId;
72 TRACE_EVENT_INSTANT2(devtoolsMetadataEventCategory, "SetLayerTreeId", "sessi onId", sessionId().utf8(), "layerTreeId", m_layerTreeId); 74 TRACE_EVENT_INSTANT2(devtoolsMetadataEventCategory, "SetLayerTreeId", "sessi onId", sessionId().utf8(), "layerTreeId", m_layerTreeId);
73 } 75 }
74 76
75 void InspectorTracingAgent::setFrontend(InspectorFrontend* frontend) 77 void InspectorTracingAgent::setFrontend(InspectorFrontend* frontend)
76 { 78 {
77 m_frontend = frontend->tracing(); 79 m_frontend = frontend->tracing();
78 } 80 }
79 81
82 void InspectorTracingAgent::clearFrontend()
83 {
84 m_state->remove(TracingAgentState::sessionId);
yurys 2014/10/17 06:29:35 You should also reset session id on the worker age
loislo 2014/10/17 07:12:00 Done.
80 } 85 }
86
87 }
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTracingAgent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698