[DevTools] Move from InstrumentingAgents to InstrumentingSessions.

third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/WebDevToolsAgentImpl.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8Binding.h"
+#include "core/InstrumentingAgents.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorAnimationAgent.h"
 #include "core/inspector/InspectorApplicationCacheAgent.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorDOMAgent.h"
 #include "core/inspector/InspectorDOMDebuggerAgent.h"
 #include "core/inspector/InspectorDebuggerAgent.h"
 #include "core/inspector/InspectorHeapProfilerAgent.h"
 #include "core/inspector/InspectorInputAgent.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorLayerTreeAgent.h"
 #include "core/inspector/InspectorMemoryAgent.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorProfilerAgent.h"
 #include "core/inspector/InspectorResourceAgent.h"
 #include "core/inspector/InspectorResourceContainer.h"
 #include "core/inspector/InspectorResourceContentLoader.h"
 #include "core/inspector/InspectorTaskRunner.h"
 #include "core/inspector/InspectorTracingAgent.h"
 #include "core/inspector/InspectorWorkerAgent.h"
-#include "core/inspector/InstrumentingAgents.h"
 #include "core/inspector/LayoutEditor.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/inspector/PageConsoleAgent.h"
 #include "core/inspector/PageDebuggerAgent.h"
 #include "core/inspector/PageRuntimeAgent.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "modules/accessibility/InspectorAccessibilityAgent.h"
 #include "modules/cachestorage/InspectorCacheStorageAgent.h"
@@ skipping 227 matching lines @@
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebLocalFrameImpl* webLocalFrameImpl,
     WebDevToolsAgentClient* client,
     InspectorOverlay* overlay,
     bool includeViewAgents)
     : m_client(client)
     , m_webLocalFrameImpl(webLocalFrameImpl)
 #if DCHECK_IS_ON()
     , m_hasBeenDisposed(false)
 #endif
-    , m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents())
+    , m_instrumentingSessions(m_webLocalFrameImpl->frame()->instrumentingSessions())
     , m_resourceContentLoader(InspectorResourceContentLoader::create(m_webLocalFrameImpl->frame()))
     , m_overlay(overlay)
     , m_inspectedFrames(InspectedFrames::create(m_webLocalFrameImpl->frame()))
     , m_resourceContainer(new InspectorResourceContainer(m_inspectedFrames))
     , m_domAgent(nullptr)
     , m_pageAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
     , m_tracingAgent(nullptr)
     , m_includeViewAgents(includeViewAgents)
@@ skipping 30 matching lines @@
 
 // static
 void WebDevToolsAgentImpl::webFrameWidgetImplClosed(WebFrameWidgetImpl* webFrameWidgetImpl)
 {
     ClientMessageLoopAdapter::webFrameWidgetImplClosed(webFrameWidgetImpl);
 }
 
 DEFINE_TRACE(WebDevToolsAgentImpl)
 {
     visitor->trace(m_webLocalFrameImpl);
-    visitor->trace(m_instrumentingAgents);
+    visitor->trace(m_instrumentingSessions);
     visitor->trace(m_resourceContentLoader);
     visitor->trace(m_overlay);
     visitor->trace(m_inspectedFrames);
     visitor->trace(m_resourceContainer);
     visitor->trace(m_domAgent);
     visitor->trace(m_pageAgent);
     visitor->trace(m_resourceAgent);
     visitor->trace(m_layerTreeAgent);
     visitor->trace(m_tracingAgent);
     visitor->trace(m_session);
 }
 
 void WebDevToolsAgentImpl::willBeDestroyed()
 {
     DCHECK(m_webLocalFrameImpl->frame());
     DCHECK(m_inspectedFrames->root()->view());
     detach();
     m_resourceContentLoader->dispose();
 }
 
 void WebDevToolsAgentImpl::initializeSession(int sessionId, const String& hostId)
 {
-    m_session = new InspectorSession(this, sessionId, m_instrumentingAgents.get(), false /* autoFlush */);
+    m_session = new InspectorSession(this, sessionId, false /* autoFlush */);
 
     ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client);
     MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance();
     v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
 
     m_v8Session = mainThreadDebugger->debugger()->connect(mainThreadDebugger->contextGroupId(m_inspectedFrames->root()));
     V8RuntimeAgent* runtimeAgent = m_v8Session->runtimeAgent();
 
     m_session->append(PageRuntimeAgent::create(this, runtimeAgent, m_inspectedFrames.get()));
 
@@ skipping 52 matching lines @@
     if (m_includeViewAgents) {
         // TODO(dgozman): we should actually pass the view instead of frame, but during
         // remote->local transition we cannot access mainFrameImpl() yet, so we have to store the
         // frame which will become the main frame later.
         m_session->append(InspectorRenderingAgent::create(m_webLocalFrameImpl, m_overlay.get()));
         m_session->append(InspectorEmulationAgent::create(m_webLocalFrameImpl, this));
         // TODO(dgozman): migrate each of the following agents to frame once module is ready.
         Page* page = m_webLocalFrameImpl->viewImpl()->page();
         m_session->append(InspectorDatabaseAgent::create(page));
         m_session->append(DeviceOrientationInspectorAgent::create(page));
-        m_session->append(InspectorAccessibilityAgent::create(page));
+        m_session->append(new InspectorAccessibilityAgent(page, m_domAgent));
         m_session->append(InspectorDOMStorageAgent::create(page));
         m_session->append(InspectorCacheStorageAgent::create());
     }
 
     if (m_overlay)
         m_overlay->init(cssAgent, debuggerAgent, m_domAgent);
 
     Platform::current()->currentThread()->addTaskObserver(this);
-    InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
+    InspectorInstrumentation::registerInstrumentingSessions(m_instrumentingSessions.get());
+    m_instrumentingSessions->add(m_session);
 }
 
 void WebDevToolsAgentImpl::destroySession()
 {
     if (m_overlay)
         m_overlay->clear();
 
     m_tracingAgent.clear();
     m_layerTreeAgent.clear();
     m_resourceAgent.clear();
     m_pageAgent.clear();
     m_domAgent.clear();
 
     m_session->detach();
+    m_instrumentingSessions->remove(m_session);
     m_v8Session.clear();
     m_session.clear();
 
     Platform::current()->currentThread()->removeTaskObserver(this);
-    InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
+    InspectorInstrumentation::unregisterInstrumentingSessions(m_instrumentingSessions.get());
 }
 
 void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId)
 {
     if (attached())
         return;
     initializeSession(sessionId, hostId);
     m_session->attach(nullptr);
 }
 
@@ skipping 153 matching lines @@
 void WebDevToolsAgentImpl::flushPendingProtocolNotifications()
 {
     if (m_session)
         m_session->flushPendingProtocolNotifications();
 }
 
 void WebDevToolsAgentImpl::willProcessTask()
 {
     if (!attached())
         return;
-    if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
-        profilerAgent->willProcessTask();
+    for (InspectorSession* session : *m_instrumentingSessions) {
+        if (InspectorProfilerAgent* profilerAgent = session->instrumentingAgents()->inspectorProfilerAgent())
+            profilerAgent->willProcessTask();
+    }
 }
 
 void WebDevToolsAgentImpl::didProcessTask()
 {
     if (!attached())
         return;
-    if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
-        profilerAgent->didProcessTask();
+    for (InspectorSession* session : *m_instrumentingSessions) {
+        if (InspectorProfilerAgent* profilerAgent = session->instrumentingAgents()->inspectorProfilerAgent())
+            profilerAgent->didProcessTask();
+    }
     flushPendingProtocolNotifications();
 }
 
 void WebDevToolsAgentImpl::runDebuggerTask(int sessionId, PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
 {
     WebDevToolsAgent* webagent = descriptor->agent();
     if (!webagent)
         return;
 
     WebDevToolsAgentImpl* agentImpl = static_cast<WebDevToolsAgentImpl*>(webagent);
@@ skipping 13 matching lines @@
     if (!protocol::Dispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == "Debugger.pause"
         || commandName == "Debugger.setBreakpoint"
         || commandName == "Debugger.setBreakpointByUrl"
         || commandName == "Debugger.removeBreakpoint"
         || commandName == "Debugger.setBreakpointsActive";
 }
 
 } // namespace blink