Index: Source/core/inspector/WorkerInspectorController.h |
diff --git a/Source/core/inspector/WorkerInspectorController.h b/Source/core/inspector/WorkerInspectorController.h |
index 3e06e99ef7e1b2ae63dcb2592d1fe66b1db2b20f..67886766ee8201ceeb813820b38ab1bd0a2fefa0 100644 |
--- a/Source/core/inspector/WorkerInspectorController.h |
+++ b/Source/core/inspector/WorkerInspectorController.h |
@@ -47,35 +47,42 @@ class InspectorFrontendChannel; |
class InspectorState; |
class InspectorStateClient; |
class InstrumentingAgents; |
+class WorkerDebuggerAgent; |
class WorkerGlobalScope; |
class WorkerScriptDebugServer; |
-class WorkerInspectorController { |
+class WorkerInspectorController : public NoBaseWillBeGarbageCollectedFinalized<WorkerInspectorController> { |
WTF_MAKE_NONCOPYABLE(WorkerInspectorController); |
- WTF_MAKE_FAST_ALLOCATED; |
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
public: |
- WorkerInspectorController(WorkerGlobalScope*); |
+ explicit WorkerInspectorController(WorkerGlobalScope*); |
~WorkerInspectorController(); |
+ void trace(Visitor*); |
void connectFrontend(); |
void disconnectFrontend(); |
void restoreInspectorStateFromCookie(const String& inspectorCookie); |
void dispatchMessageFromFrontend(const String&); |
void resume(); |
+ void dispose(); |
+ WorkerDebuggerAgent* workerDebuggerAgent() { return m_workerDebuggerAgent.get(); } |
private: |
friend InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope*); |
- WorkerGlobalScope* m_workerGlobalScope; |
+ InspectorAgentRegistry& agents() { return *m_agents; } |
+ |
+ RawPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope; |
OwnPtr<InspectorStateClient> m_stateClient; |
OwnPtr<InspectorCompositeState> m_state; |
- RefPtr<InstrumentingAgents> m_instrumentingAgents; |
+ RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents; |
OwnPtr<InjectedScriptManager> m_injectedScriptManager; |
OwnPtr<WorkerScriptDebugServer> m_debugServer; |
- InspectorAgentRegistry m_agents; |
+ OwnPtrWillBeMember<InspectorAgentRegistry> m_agents; |
haraken
2014/06/17 14:06:18
You can keep the InspectorAgentRegistry as a part
keishi
2014/06/18 12:31:07
Done.
|
OwnPtr<InspectorFrontendChannel> m_frontendChannel; |
OwnPtr<InspectorFrontend> m_frontend; |
RefPtr<InspectorBackendDispatcher> m_backendDispatcher; |
+ RawPtrWillBeMember<WorkerDebuggerAgent> m_workerDebuggerAgent; |
}; |
} |