[DevTools] Remove extra plumbing from InspectorWorkerAgent, prepare to multi-client.

third_party/WebKit/Source/core/inspector/PageConsoleAgent.cpp

 /*
  * Copyright (C) 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 46 matching lines @@
 #if !ENABLE(OILPAN)
     m_inspectorDOMAgent = nullptr;
     m_instrumentingAgents->setPageConsoleAgent(nullptr);
 #endif
 }
 
 DEFINE_TRACE(PageConsoleAgent)
 {
     visitor->trace(m_inspectorDOMAgent);
     visitor->trace(m_inspectedFrames);
+#if ENABLE(OILPAN)
+    visitor->trace(m_workersWithEnabledConsole);
+#endif
     InspectorConsoleAgent::trace(visitor);
 }
 
 void PageConsoleAgent::enable(ErrorString* errorString)
 {
     InspectorConsoleAgent::enable(errorString);
     m_workersWithEnabledConsole.clear();
     m_instrumentingAgents->setPageConsoleAgent(this);
 }
 
 void PageConsoleAgent::disable(ErrorString* errorString)
 {
     m_instrumentingAgents->setPageConsoleAgent(nullptr);
     InspectorConsoleAgent::disable(errorString);
+    m_workersWithEnabledConsole.clear();
 }
 
 void PageConsoleAgent::clearMessages(ErrorString* errorString)
 {
     m_inspectorDOMAgent->releaseDanglingNodes();
     messageStorage()->clear(m_inspectedFrames->root()->document());
 }
 
-void PageConsoleAgent::workerConsoleAgentEnabled(WorkerGlobalScopeProxy* proxy)
+void PageConsoleAgent::workerConsoleAgentEnabled(WorkerInspectorProxy* workerInspectorProxy)
 {
-    m_workersWithEnabledConsole.add(proxy);
+    m_workersWithEnabledConsole.add(workerInspectorProxy);
 }
 
 ConsoleMessageStorage* PageConsoleAgent::messageStorage()
 {
     return &m_inspectedFrames->root()->host()->consoleMessageStorage();
 }
 
 void PageConsoleAgent::workerTerminated(WorkerInspectorProxy* workerInspectorProxy)
 {
-    WorkerGlobalScopeProxy* proxy = workerInspectorProxy->workerGlobalScopeProxy();
-    if (!proxy)
+    WorkerInspectorProxySet::iterator it = m_workersWithEnabledConsole.find(workerInspectorProxy);
+    if (it != m_workersWithEnabledConsole.end()) {
+        m_workersWithEnabledConsole.remove(it);
         return;
-
-    HashSet<WorkerGlobalScopeProxy*>::iterator iterator = m_workersWithEnabledConsole.find(proxy);
-    bool workerAgentWasEnabled = iterator != m_workersWithEnabledConsole.end();
-    if (workerAgentWasEnabled)
-        return;
+    }
 
     ConsoleMessageStorage* storage = messageStorage();
     size_t messageCount = storage->size();
     for (size_t i = 0; i < messageCount; ++i) {
         ConsoleMessage* message = storage->at(i);
-        if (message->workerGlobalScopeProxy() == proxy) {
-            message->setWorkerGlobalScopeProxy(nullptr);
+        if (message->workerInspectorProxy() == workerInspectorProxy) {
+            message->setWorkerInspectorProxy(nullptr);
             sendConsoleMessageToFrontend(message, false);
         }
     }
 }
 
 void PageConsoleAgent::enableStackCapturingIfNeeded()
 {
     if (!s_enabledAgentCount)
         ScriptController::setCaptureCallStackForUncaughtExceptions(toIsolate(m_inspectedFrames->root()), true);
     ++s_enabledAgentCount;
 }
 
 void PageConsoleAgent::disableStackCapturingIfNeeded()
 {
     if (!(--s_enabledAgentCount))
         ScriptController::setCaptureCallStackForUncaughtExceptions(toIsolate(m_inspectedFrames->root()), false);
 }
 
 } // namespace blink