Index: Source/core/inspector/InspectorConsoleAgent.cpp |
diff --git a/Source/core/inspector/InspectorConsoleAgent.cpp b/Source/core/inspector/InspectorConsoleAgent.cpp |
index b89257e61af1115655af7633c757e1d420d8681d..f56f6415bdb45392cf0bec745f00f776979ab0e6 100644 |
--- a/Source/core/inspector/InspectorConsoleAgent.cpp |
+++ b/Source/core/inspector/InspectorConsoleAgent.cpp |
@@ -44,6 +44,7 @@ |
#include "core/inspector/ScriptCallStack.h" |
#include "core/loader/DocumentLoader.h" |
#include "core/page/Page.h" |
+#include "core/workers/WorkerGlobalScopeProxy.h" |
#include "platform/network/ResourceError.h" |
#include "platform/network/ResourceResponse.h" |
#include "wtf/CurrentTime.h" |
@@ -177,6 +178,21 @@ void InspectorConsoleAgent::addMessageToConsole(ConsoleMessage* consoleMessage) |
} |
} |
+void InspectorConsoleAgent::addMessageToConsoleFromWorker(WorkerGlobalScopeProxy* proxy, ConsoleMessage* consoleMessage) |
+{ |
+ InspectorConsoleMessage* message = new InspectorConsoleMessage(false, consoleMessage->source(), LogMessageType, consoleMessage->level(), consoleMessage->message(), consoleMessage->url(), consoleMessage->lineNumber(), consoleMessage->columnNumber(), consoleMessage->scriptState(), consoleMessage->requestIdentifier()); |
+ message->setWorkerGlobalScopeProxy(proxy); |
+ addConsoleMessage(adoptPtr(message)); |
+} |
+ |
+void InspectorConsoleAgent::workerGlobalScopeTerminated(WorkerGlobalScopeProxy* proxy) |
+{ |
+ for (size_t i = 0; i < m_consoleMessages.size(); i++) { |
+ if (m_consoleMessages[i]->getWorkerGlobalScopeProxy() == proxy) |
+ m_consoleMessages[i]->setWorkerGlobalScopeProxy(nullptr); |
+ } |
+} |
+ |
void InspectorConsoleAgent::addConsoleAPIMessageToConsole(MessageType type, MessageLevel level, const String& message, ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, unsigned long requestIdentifier) |
{ |
if (type == ClearMessageType) { |