| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/inspector/ConsoleMessage.h" | 5 #include "core/inspector/ConsoleMessage.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptCallStack.h" | 7 #include "bindings/core/v8/ScriptCallStack.h" |
| 8 #include "bindings/core/v8/ScriptValue.h" | 8 #include "bindings/core/v8/ScriptValue.h" |
| 9 #include "bindings/core/v8/SourceLocation.h" | 9 #include "bindings/core/v8/SourceLocation.h" |
| 10 #include "core/inspector/ScriptArguments.h" | 10 #include "core/inspector/ScriptArguments.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 61 |
| 62 // static | 62 // static |
| 63 ConsoleMessage* ConsoleMessage::createForConsoleAPI(MessageLevel level, MessageT
ype type, const String& message, ScriptArguments* arguments) | 63 ConsoleMessage* ConsoleMessage::createForConsoleAPI(MessageLevel level, MessageT
ype type, const String& message, ScriptArguments* arguments) |
| 64 { | 64 { |
| 65 ConsoleMessage* consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSou
rce, level, message, String(), 0, 0, ScriptCallStack::captureForConsole(), 0, ar
guments); | 65 ConsoleMessage* consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSou
rce, level, message, String(), 0, 0, ScriptCallStack::captureForConsole(), 0, ar
guments); |
| 66 consoleMessage->m_type = type; | 66 consoleMessage->m_type = type; |
| 67 return consoleMessage; | 67 return consoleMessage; |
| 68 } | 68 } |
| 69 | 69 |
| 70 // static | 70 // static |
| 71 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level,
const String& message, PassOwnPtr<SourceLocation> location) | 71 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level,
const String& message, PassOwnPtr<SourceLocation> location, ScriptArguments* ar
guments) |
| 72 { | 72 { |
| 73 if (!location) | 73 if (!location) |
| 74 return new ConsoleMessage(source, level, message, String(), 0, 0, nullpt
r, 0, nullptr); | 74 return new ConsoleMessage(source, level, message, String(), 0, 0, nullpt
r, 0, arguments); |
| 75 return new ConsoleMessage(source, level, message, location->url(), location-
>lineNumber(), location->columnNumber(), location->takeStackTrace(), location->s
criptId(), nullptr); | 75 return new ConsoleMessage(source, level, message, location->url(), location-
>lineNumber(), location->columnNumber(), location->takeStackTrace(), location->s
criptId(), arguments); |
| 76 } | 76 } |
| 77 | 77 |
| 78 // static | 78 // static |
| 79 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level,
const String& message, const String& url, unsigned lineNumber, unsigned columnN
umber, PassOwnPtr<V8StackTrace> stackTrace, int scriptId, ScriptArguments* argum
ents) | 79 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level,
const String& message, const String& url, unsigned lineNumber, unsigned columnN
umber, PassOwnPtr<V8StackTrace> stackTrace, int scriptId, ScriptArguments* argum
ents) |
| 80 { | 80 { |
| 81 return new ConsoleMessage(source, level, message, url, lineNumber, columnNum
ber, std::move(stackTrace), scriptId, arguments); | 81 return new ConsoleMessage(source, level, message, url, lineNumber, columnNum
ber, std::move(stackTrace), scriptId, arguments); |
| 82 } | 82 } |
| 83 | 83 |
| 84 ConsoleMessage::ConsoleMessage(MessageSource source, | 84 ConsoleMessage::ConsoleMessage(MessageSource source, |
| 85 MessageLevel level, | 85 MessageLevel level, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 return m_scriptArguments->argumentCount(); | 195 return m_scriptArguments->argumentCount(); |
| 196 return 0; | 196 return 0; |
| 197 } | 197 } |
| 198 | 198 |
| 199 DEFINE_TRACE(ConsoleMessage) | 199 DEFINE_TRACE(ConsoleMessage) |
| 200 { | 200 { |
| 201 visitor->trace(m_scriptArguments); | 201 visitor->trace(m_scriptArguments); |
| 202 } | 202 } |
| 203 | 203 |
| 204 } // namespace blink | 204 } // namespace blink |
| OLD | NEW |