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

Unified Diff: Source/core/workers/WorkerGlobalScope.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 5 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/workers/WorkerGlobalScope.cpp
diff --git a/Source/core/workers/WorkerGlobalScope.cpp b/Source/core/workers/WorkerGlobalScope.cpp
index 53ba4a2321fd73da421a55dd1475c4ef6f2ef884..34af44883c544646c09316a2e20154dfea2ad69e 100644
--- a/Source/core/workers/WorkerGlobalScope.cpp
+++ b/Source/core/workers/WorkerGlobalScope.cpp
@@ -275,9 +275,9 @@ EventTarget* WorkerGlobalScope::errorEventTarget()
return this;
}
-void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>)
+void WorkerGlobalScope::logExceptionToConsole(PassRefPtr<ConsoleMessage> consoleMessage)
{
- thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL);
+ thread()->workerReportingProxy().reportException(consoleMessage);
}
void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& directiveText)
@@ -285,23 +285,20 @@ void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& di
InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
}
-void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* scriptState)
+void WorkerGlobalScope::addMessage(PassRefPtr<ConsoleMessage> consoleMessage)
{
if (!isContextThread()) {
- postTask(AddConsoleMessageTask::create(source, level, message));
+ postTask(AddConsoleMessageTask::create(consoleMessage->source(), consoleMessage->level(), consoleMessage->message().isolatedCopy()));
return;
}
- thread()->workerReportingProxy().reportConsoleMessage(source, level, message, lineNumber, sourceURL);
- addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, nullptr, scriptState);
+ thread()->workerReportingProxy().reportConsoleMessage(consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url());
+ addMessageToWorkerConsole(consoleMessage);
}
-void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, ScriptState* scriptState)
+void WorkerGlobalScope::addMessageToWorkerConsole(PassRefPtr<ConsoleMessage> consoleMessage)
{
ASSERT(isContextThread());
- if (callStack)
- InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, callStack);
- else
- InspectorInstrumentation::addMessageToConsole(this, source, LogMessageType, level, message, sourceURL, lineNumber, 0, scriptState);
+ InspectorInstrumentation::addMessageToConsole(this, consoleMessage);
}
bool WorkerGlobalScope::isContextThread() const

Powered by Google App Engine
This is Rietveld 408576698