Chromium Code Reviews| Index: Source/core/workers/WorkerGlobalScope.cpp |
| diff --git a/Source/core/workers/WorkerGlobalScope.cpp b/Source/core/workers/WorkerGlobalScope.cpp |
| index 8a7257b17cb42ca445076046f2f3f1d3631187a5..5d2cd17b123b27ef82ea09e10bb6692329f0a258 100644 |
| --- a/Source/core/workers/WorkerGlobalScope.cpp |
| +++ b/Source/core/workers/WorkerGlobalScope.cpp |
| @@ -79,7 +79,7 @@ WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, W |
| , m_userAgent(userAgent) |
| , m_script(adoptPtr(new WorkerScriptController(*this))) |
| , m_thread(thread) |
| - , m_workerInspectorController(adoptPtr(new WorkerInspectorController(this))) |
| + , m_workerInspectorController(adoptPtrWillBeNoop(new WorkerInspectorController(this))) |
| , m_closing(false) |
| , m_eventQueue(WorkerEventQueue::create(this)) |
| , m_workerClients(workerClients) |
| @@ -182,6 +182,9 @@ void WorkerGlobalScope::postTask(PassOwnPtr<ExecutionContextTask> task) |
| void WorkerGlobalScope::clearInspector() |
| { |
| + if (!m_workerInspectorController) |
|
haraken
2014/06/17 14:06:18
Would you add a FIXME and mention that clearInspec
keishi
2014/06/18 12:31:07
Done.
|
| + return; |
| + m_workerInspectorController->dispose(); |
| m_workerInspectorController.clear(); |
| } |
| @@ -326,6 +329,7 @@ void WorkerGlobalScope::trace(Visitor* visitor) |
| visitor->trace(m_console); |
| visitor->trace(m_location); |
| visitor->trace(m_navigator); |
| + visitor->trace(m_workerInspectorController); |
| visitor->trace(m_eventQueue); |
| visitor->trace(m_workerClients); |
| WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor); |