DevTools: wrapping arguments addConsoleMessage in ConsoleMessage

Source/core/workers/WorkerGlobalScope.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 274 matching lines @@
 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>)
 {
     thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL);
 }
 
 void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& directiveText)
 {
     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 you should use consoleMessage,
not prpConsoleMessage after that.

[kozyatinskiy1, 2014/08/08 14:58:09]

Done. But after usages in postTask we return from function and it doesn't
matter. 

+    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);
 }
 
 bool WorkerGlobalScope::isContextThread() const
 {
     return thread()->isCurrentThread();
 }
 
 bool WorkerGlobalScope::isJSExecutionForbidden() const
 {
@@ skipping 27 matching lines @@
     visitor->trace(m_navigator);
     visitor->trace(m_workerInspectorController);
     visitor->trace(m_eventQueue);
     visitor->trace(m_workerClients);
     WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor);
     ExecutionContext::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink