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

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

Issue 24027002: DevTools: implement console.timeline/timelineEnd. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review comments addressed. Created 7 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGl obalScope) 90 WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGl obalScope)
91 : m_workerGlobalScope(workerGlobalScope) 91 : m_workerGlobalScope(workerGlobalScope)
92 , m_stateClient(adoptPtr(new WorkerStateClient(workerGlobalScope))) 92 , m_stateClient(adoptPtr(new WorkerStateClient(workerGlobalScope)))
93 , m_state(adoptPtr(new InspectorCompositeState(m_stateClient.get()))) 93 , m_state(adoptPtr(new InspectorCompositeState(m_stateClient.get())))
94 , m_instrumentingAgents(InstrumentingAgents::create()) 94 , m_instrumentingAgents(InstrumentingAgents::create())
95 , m_injectedScriptManager(InjectedScriptManager::createForWorker()) 95 , m_injectedScriptManager(InjectedScriptManager::createForWorker())
96 , m_debugServer(adoptPtr(new WorkerScriptDebugServer(workerGlobalScope, Work erDebuggerAgent::debuggerTaskMode))) 96 , m_debugServer(adoptPtr(new WorkerScriptDebugServer(workerGlobalScope, Work erDebuggerAgent::debuggerTaskMode)))
97 { 97 {
98 m_agents.append(WorkerRuntimeAgent::create(m_instrumentingAgents.get(), m_st ate.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerGlobalScope )); 98 m_agents.append(WorkerRuntimeAgent::create(m_instrumentingAgents.get(), m_st ate.get(), m_injectedScriptManager.get(), m_debugServer.get(), workerGlobalScope ));
99 99
100 OwnPtr<InspectorConsoleAgent> consoleAgent = WorkerConsoleAgent::create(m_in strumentingAgents.get(), m_state.get(), m_injectedScriptManager.get()); 100 OwnPtr<InspectorTimelineAgent> timelineAgent = InspectorTimelineAgent::creat e(m_instrumentingAgents.get(), 0, 0, 0, m_state.get(), InspectorTimelineAgent::W orkerInspector, 0);
101 OwnPtr<InspectorConsoleAgent> consoleAgent = WorkerConsoleAgent::create(m_in strumentingAgents.get(), timelineAgent.get(), m_state.get(), m_injectedScriptMan ager.get());
101 m_agents.append(WorkerDebuggerAgent::create(m_instrumentingAgents.get(), m_s tate.get(), m_debugServer.get(), workerGlobalScope, m_injectedScriptManager.get( ))); 102 m_agents.append(WorkerDebuggerAgent::create(m_instrumentingAgents.get(), m_s tate.get(), m_debugServer.get(), workerGlobalScope, m_injectedScriptManager.get( )));
102 103
103 m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), m_state.get(), m_injectedScriptManager.get())); 104 m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), m_state.get(), m_injectedScriptManager.get()));
104 m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get (), m_state.get(), m_injectedScriptManager.get())); 105 m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get (), m_state.get(), m_injectedScriptManager.get()));
105 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), 0, 0, 0, m_state.get(), InspectorTimelineAgent::WorkerInspector, 0)); 106 m_agents.append(timelineAgent.release());
106 m_agents.append(consoleAgent.release()); 107 m_agents.append(consoleAgent.release());
107 108
108 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), m_debugServer.get()); 109 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), m_debugServer.get());
109 } 110 }
110 111
111 WorkerInspectorController::~WorkerInspectorController() 112 WorkerInspectorController::~WorkerInspectorController()
112 { 113 {
113 m_instrumentingAgents->reset(); 114 m_instrumentingAgents->reset();
114 disconnectFrontend(); 115 disconnectFrontend();
115 } 116 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 157
157 void WorkerInspectorController::resume() 158 void WorkerInspectorController::resume()
158 { 159 {
159 if (WorkerRuntimeAgent* runtimeAgent = m_instrumentingAgents->workerRuntimeA gent()) { 160 if (WorkerRuntimeAgent* runtimeAgent = m_instrumentingAgents->workerRuntimeA gent()) {
160 ErrorString unused; 161 ErrorString unused;
161 runtimeAgent->run(&unused); 162 runtimeAgent->run(&unused);
162 } 163 }
163 } 164 }
164 165
165 } 166 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698