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

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

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed dgozman's comments Created 5 years, 4 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
« no previous file with comments | « Source/core/inspector/WorkerDebuggerAgent.cpp ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('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 (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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 , m_beforeInitlizedScope(adoptPtr(new InspectorTaskRunner::IgnoreInterruptsS cope(m_inspectorTaskRunner.get()))) 128 , m_beforeInitlizedScope(adoptPtr(new InspectorTaskRunner::IgnoreInterruptsS cope(m_inspectorTaskRunner.get())))
129 , m_paused(false) 129 , m_paused(false)
130 { 130 {
131 OwnPtrWillBeRawPtr<WorkerRuntimeAgent> workerRuntimeAgent = WorkerRuntimeAge nt::create(m_injectedScriptManager.get(), m_workerThreadDebugger->debugger(), wo rkerGlobalScope, this); 131 OwnPtrWillBeRawPtr<WorkerRuntimeAgent> workerRuntimeAgent = WorkerRuntimeAge nt::create(m_injectedScriptManager.get(), m_workerThreadDebugger->debugger(), wo rkerGlobalScope, this);
132 m_workerRuntimeAgent = workerRuntimeAgent.get(); 132 m_workerRuntimeAgent = workerRuntimeAgent.get();
133 m_agents.append(workerRuntimeAgent.release()); 133 m_agents.append(workerRuntimeAgent.release());
134 134
135 OwnPtrWillBeRawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebugger Agent::create(m_workerThreadDebugger.get(), workerGlobalScope, m_injectedScriptM anager.get()); 135 OwnPtrWillBeRawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebugger Agent::create(m_workerThreadDebugger.get(), workerGlobalScope, m_injectedScriptM anager.get());
136 m_workerDebuggerAgent = workerDebuggerAgent.get(); 136 m_workerDebuggerAgent = workerDebuggerAgent.get();
137 m_agents.append(workerDebuggerAgent.release()); 137 m_agents.append(workerDebuggerAgent.release());
138 m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(m_workerDebugge rAgent, m_instrumentingAgents.get())); 138 m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(m_workerDebugge rAgent->v8DebuggerAgent(), m_instrumentingAgents.get()));
139 139
140 v8::Isolate* isolate = workerGlobalScope->thread()->isolate(); 140 v8::Isolate* isolate = workerGlobalScope->thread()->isolate();
141 m_agents.append(InspectorProfilerAgent::create(isolate, m_injectedScriptMana ger.get(), 0)); 141 m_agents.append(InspectorProfilerAgent::create(isolate, m_injectedScriptMana ger.get(), 0));
142 m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_injectedScript Manager.get())); 142 m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_injectedScript Manager.get()));
143 143
144 OwnPtrWillBeRawPtr<WorkerConsoleAgent> workerConsoleAgent = WorkerConsoleAge nt::create(m_injectedScriptManager.get(), workerGlobalScope); 144 OwnPtrWillBeRawPtr<WorkerConsoleAgent> workerConsoleAgent = WorkerConsoleAge nt::create(m_injectedScriptManager.get(), workerGlobalScope);
145 WorkerConsoleAgent* workerConsoleAgentPtr = workerConsoleAgent.get(); 145 WorkerConsoleAgent* workerConsoleAgentPtr = workerConsoleAgent.get();
146 workerConsoleAgentPtr->setDebuggerAgent(m_workerDebuggerAgent); 146 workerConsoleAgentPtr->setDebuggerAgent(m_workerDebuggerAgent->v8DebuggerAge nt());
147 m_agents.append(workerConsoleAgent.release()); 147 m_agents.append(workerConsoleAgent.release());
148 148
149 m_agents.append(InspectorTimelineAgent::create()); 149 m_agents.append(InspectorTimelineAgent::create());
150 150
151 m_injectedScriptManager->injectedScriptHost()->init(workerConsoleAgentPtr, m _workerDebuggerAgent, nullptr, m_workerThreadDebugger->debugger(), adoptPtr(new WorkerInjectedScriptHostClient())); 151 m_injectedScriptManager->injectedScriptHost()->init(workerConsoleAgentPtr, m _workerDebuggerAgent->v8DebuggerAgent(), nullptr, m_workerThreadDebugger->debugg er(), adoptPtr(new WorkerInjectedScriptHostClient()));
152 } 152 }
153 153
154 WorkerInspectorController::~WorkerInspectorController() 154 WorkerInspectorController::~WorkerInspectorController()
155 { 155 {
156 } 156 }
157 157
158 void WorkerInspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<Inspe ctorAgent> agent) 158 void WorkerInspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<Inspe ctorAgent> agent)
159 { 159 {
160 m_agents.append(agent); 160 m_agents.append(agent);
161 } 161 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 visitor->trace(m_instrumentingAgents); 250 visitor->trace(m_instrumentingAgents);
251 visitor->trace(m_injectedScriptManager); 251 visitor->trace(m_injectedScriptManager);
252 visitor->trace(m_backendDispatcher); 252 visitor->trace(m_backendDispatcher);
253 visitor->trace(m_agents); 253 visitor->trace(m_agents);
254 visitor->trace(m_workerDebuggerAgent); 254 visitor->trace(m_workerDebuggerAgent);
255 visitor->trace(m_asyncCallTracker); 255 visitor->trace(m_asyncCallTracker);
256 visitor->trace(m_workerRuntimeAgent); 256 visitor->trace(m_workerRuntimeAgent);
257 } 257 }
258 258
259 } // namespace blink 259 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/WorkerDebuggerAgent.cpp ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698