Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Unified Diff: Source/core/inspector/InspectorConsoleAgent.cpp

Issue 466753002: DevTools: Do not push to frontend messages from worker while it is alive (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove unneeded changes Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {

Powered by Google App Engine
This is Rietveld 408576698