Chromium Code Reviews| Index: Source/core/workers/WorkerGlobalScope.cpp |
| diff --git a/Source/core/workers/WorkerGlobalScope.cpp b/Source/core/workers/WorkerGlobalScope.cpp |
| index bd141b79bfcbfb245a679553105bdbf6b5ccbf88..f28172c3d58112abd7652269cb1a265c9e440575 100644 |
| --- a/Source/core/workers/WorkerGlobalScope.cpp |
| +++ b/Source/core/workers/WorkerGlobalScope.cpp |
| @@ -292,22 +292,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> prpConsoleMessage) |
| { |
| if (!isContextThread()) { |
| - postTask(AddConsoleMessageTask::create(source, level, message)); |
| + postTask(AddConsoleMessageTask::create(prpConsoleMessage->source(), prpConsoleMessage->level(), prpConsoleMessage->message())); |
| return; |
| } |
| - thread()->workerReportingProxy().reportConsoleMessage(source, level, message, lineNumber, sourceURL); |
| - addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, nullptr, scriptState); |
| + RefPtr<ConsoleMessage> consoleMessage = prpConsoleMessage; |
|
vsevik
2014/08/08 13:06:29
This should be the first line of this method and y
kozyatinskiy1
2014/08/08 14:58:09
Done. But after usages in postTask we return from
|
| + thread()->workerReportingProxy().reportConsoleMessage(consoleMessage); |
| + addMessageToWorkerConsole(consoleMessage.release()); |
| } |
| -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()); |
| - RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, level, message, sourceURL, lineNumber); |
| - consoleMessage->setCallStack(callStack); |
| - consoleMessage->setScriptState(scriptState); |
| InspectorInstrumentation::addMessageToConsole(this, consoleMessage); |
| } |