tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / inspector / InspectorWorkerAgent.cpp

diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
index 5779bc8..7511da1 100755 (executable)
--- a/Source/WebCore/inspector/InspectorWorkerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
@@ -111,49 +111,44 @@ PassOwnPtr<InspectorWorkerAgent> InspectorWorkerAgent::create(InstrumentingAgent
 }
 
 InspectorWorkerAgent::InspectorWorkerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState)
-    : m_instrumentingAgents(instrumentingAgents)
+    : InspectorBaseAgent<InspectorWorkerAgent>("Worker", instrumentingAgents, inspectorState)
     , m_inspectorFrontend(0)
-    , m_inspectorState(inspectorState)
 {
+    m_instrumentingAgents->setInspectorWorkerAgent(this);
 }
 
 InspectorWorkerAgent::~InspectorWorkerAgent()
 {
+    m_instrumentingAgents->setInspectorWorkerAgent(0);
 }
 
 void InspectorWorkerAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_inspectorFrontend = frontend;
-    restore();
 }
 
 void InspectorWorkerAgent::restore()
 {
-    if (m_inspectorState->getBoolean(WorkerAgentState::workerInspectionEnabled))
-        m_instrumentingAgents->setInspectorWorkerAgent(this);
+    if (m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
+        createWorkerFrontendChannelsForExistingWorkers();
 }
 
 void InspectorWorkerAgent::clearFrontend()
 {
     m_inspectorFrontend = 0;
-    m_instrumentingAgents->setInspectorWorkerAgent(0);
-    m_inspectorState->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
-    for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
-        it->second->disconnectFromWorkerContext();
-        delete it->second;
-    }
-    m_idToChannel.clear();
+    m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
+    destroyWorkerFrontendChannels();
 }
 
 void InspectorWorkerAgent::setWorkerInspectionEnabled(ErrorString*, bool value)
 {
-    m_inspectorState->setBoolean(WorkerAgentState::workerInspectionEnabled, value);
+    m_state->setBoolean(WorkerAgentState::workerInspectionEnabled, value);
     if (!m_inspectorFrontend)
         return;
     if (value)
-        m_instrumentingAgents->setInspectorWorkerAgent(this);
+        createWorkerFrontendChannelsForExistingWorkers();
     else
-        m_instrumentingAgents->setInspectorWorkerAgent(0);
+        destroyWorkerFrontendChannels();
 }
 
 void InspectorWorkerAgent::connectToWorker(ErrorString* error, int workerId)
@@ -185,23 +180,24 @@ void InspectorWorkerAgent::sendMessageToWorker(ErrorString* error, int workerId,
 
 void InspectorWorkerAgent::setAutoconnectToWorkers(ErrorString*, bool value)
 {
-    m_inspectorState->setBoolean(WorkerAgentState::autoconnectToWorkers, value);
+    m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, value);
 }
 
-void InspectorWorkerAgent::didStartWorkerContext(WorkerContextProxy* workerContextProxy, const KURL& url)
+bool InspectorWorkerAgent::shouldPauseDedicatedWorkerOnStart()
 {
-    WorkerFrontendChannel* channel = new WorkerFrontendChannel(m_inspectorFrontend, workerContextProxy);
-    m_idToChannel.set(channel->id(), channel);
+    return m_state->getBoolean(WorkerAgentState::autoconnectToWorkers);
+}
 
-    ASSERT(m_inspectorFrontend);
-    bool autoconnectToWorkers = m_inspectorState->getBoolean(WorkerAgentState::autoconnectToWorkers);
-    if (autoconnectToWorkers)
-        channel->connectToWorkerContext();
-    m_inspectorFrontend->worker()->workerCreated(channel->id(), url.string(), autoconnectToWorkers);
+void InspectorWorkerAgent::didStartWorkerContext(WorkerContextProxy* workerContextProxy, const KURL& url)
+{
+    m_dedicatedWorkers.set(workerContextProxy, url.string());
+    if (m_inspectorFrontend && m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
+        createWorkerFrontendChannel(workerContextProxy, url.string());
 }
 
 void InspectorWorkerAgent::workerContextTerminated(WorkerContextProxy* proxy)
 {
+    m_dedicatedWorkers.remove(proxy);
     for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
         if (proxy == it->second->proxy()) {
             m_inspectorFrontend->worker()->workerTerminated(it->first);
@@ -212,6 +208,33 @@ void InspectorWorkerAgent::workerContextTerminated(WorkerContextProxy* proxy)
     }
 }
 
+void InspectorWorkerAgent::createWorkerFrontendChannelsForExistingWorkers()
+{
+    for (DedicatedWorkers::iterator it = m_dedicatedWorkers.begin(); it != m_dedicatedWorkers.end(); ++it)
+        createWorkerFrontendChannel(it->first, it->second);
+}
+
+void InspectorWorkerAgent::destroyWorkerFrontendChannels()
+{
+    for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
+        it->second->disconnectFromWorkerContext();
+        delete it->second;
+    }
+    m_idToChannel.clear();
+}
+
+void InspectorWorkerAgent::createWorkerFrontendChannel(WorkerContextProxy* workerContextProxy, const String& url)
+{
+    WorkerFrontendChannel* channel = new WorkerFrontendChannel(m_inspectorFrontend, workerContextProxy);
+    m_idToChannel.set(channel->id(), channel);
+
+    ASSERT(m_inspectorFrontend);
+    bool autoconnectToWorkers = m_state->getBoolean(WorkerAgentState::autoconnectToWorkers);
+    if (autoconnectToWorkers)
+        channel->connectToWorkerContext();
+    m_inspectorFrontend->worker()->workerCreated(channel->id(), url, autoconnectToWorkers);
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS) && ENABLE(INSPECTOR)