[DevTools] Destroy agents on detach.

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 297 matching lines @@
     , 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_agents(m_instrumentingAgents.get())
-    , m_deferredAgentsInitialized(false)
     , m_includeViewAgents(includeViewAgents)
     , m_sessionId(0)
     , m_stateMuted(false)
     , m_layerTreeId(0)
 {
     DCHECK(isMainThread());
     DCHECK(m_webLocalFrameImpl->frame());
 }
 
 WebDevToolsAgentImpl::~WebDevToolsAgentImpl()
@@ skipping 48 matching lines @@
     DCHECK(m_webLocalFrameImpl->frame());
     DCHECK(m_inspectedFrames->root()->view());
 
     detach();
     m_resourceContentLoader->dispose();
     m_agents.discardAgents();
     m_instrumentingAgents->reset();
     m_v8Session.clear();
 }
 
-void WebDevToolsAgentImpl::initializeDeferredAgents()
+void WebDevToolsAgentImpl::initializeAgents()
 {
-    if (m_deferredAgentsInitialized)
-        return;
-    m_deferredAgentsInitialized = true;
-
     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_agents.append(PageRuntimeAgent::create(this, runtimeAgent, m_inspectedFrames.get()));
 
     InspectorDOMAgent* domAgent = InspectorDOMAgent::create(isolate, m_inspectedFrames.get(), runtimeAgent, m_overlay.get());
@@ skipping 59 matching lines @@
         m_agents.append(DeviceOrientationInspectorAgent::create(page));
         m_agents.append(InspectorAccessibilityAgent::create(page));
         m_agents.append(InspectorDOMStorageAgent::create(page));
         m_agents.append(InspectorCacheStorageAgent::create());
     }
 
     if (m_overlay)
         m_overlay->init(cssAgent, debuggerAgent, m_domAgent);
 }
 
+void WebDevToolsAgentImpl::destroyAgents()
+{
+    if (m_overlay)
+        m_overlay->clear();
+
+    m_tracingAgent.clear();
+    m_layerTreeAgent.clear();
+    m_resourceAgent.clear();
+    m_pageAgent.clear();
+    m_domAgent.clear();
+
+    m_agents.discardAgents();
+    m_instrumentingAgents->reset();
+    m_v8Session.clear();
+}
+
 void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId)
 {
     if (m_attached)
         return;
 
     // Set the attached bit first so that sync notifications were delivered.
     m_attached = true;
     m_sessionId = sessionId;
 
-    initializeDeferredAgents();
+    initializeAgents();
     m_resourceAgent->setHostId(hostId);
 
     m_inspectorFrontend = adoptPtr(new protocol::Frontend(this));
     // We can reconnect to existing front-end -> unmute state.
     m_stateMuted = false;
     m_agents.setFrontend(m_inspectorFrontend.get());
 
     InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
     InspectorInstrumentation::frontendCreated();
 
@@ skipping 21 matching lines @@
 
     m_inspectorBackendDispatcher->clearFrontend();
     m_inspectorBackendDispatcher.clear();
 
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_stateMuted = true;
     m_agents.clearFrontend();
     m_inspectorFrontend.clear();
 
-    // Release overlay resources.
-    if (m_overlay)
-        m_overlay->clear();
+    destroyAgents();
     InspectorInstrumentation::frontendDeleted();
     InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
 
     m_sessionId = 0;
     m_attached = false;
 }
 
 void WebDevToolsAgentImpl::continueProgram()
 {
     ClientMessageLoopAdapter::continueProgram();
@@ skipping 202 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