| Index: Source/core/workers/WorkerGlobalScope.cpp
|
| diff --git a/Source/core/workers/WorkerGlobalScope.cpp b/Source/core/workers/WorkerGlobalScope.cpp
|
| index 53ba4a2321fd73da421a55dd1475c4ef6f2ef884..19091688b28004ab043b019cf3abce8d87d214ec 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(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleError)
|
| {
|
| - thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL);
|
| + thread()->workerReportingProxy().reportException(consoleError);
|
| }
|
|
|
| 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(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleError)
|
| {
|
| if (!isContextThread()) {
|
| - postTask(AddConsoleMessageTask::create(source, level, message));
|
| + postTask(AddConsoleMessageTask::create(consoleError->source(), consoleError->level(), consoleError->message()));
|
| return;
|
| }
|
| - thread()->workerReportingProxy().reportConsoleMessage(source, level, message, lineNumber, sourceURL);
|
| - addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, nullptr, scriptState);
|
| + thread()->workerReportingProxy().reportConsoleMessage(consoleError->source(), consoleError->level(), consoleError->message(), consoleError->lineNumber(), consoleError->url());
|
| + addMessageToWorkerConsole(consoleError);
|
| }
|
|
|
| -void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, ScriptState* scriptState)
|
| +void WorkerGlobalScope::addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleError)
|
| {
|
| 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, consoleError);
|
| }
|
|
|
| bool WorkerGlobalScope::isContextThread() const
|
|
|