| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) |
| 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, nullptr); |
| 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(), nullptr); |
| 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, std::unique_ptr<V8StackTrace> stackTrace, int scriptId, ScriptArguments*
arguments) |
| 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, |
| 86 const String& message, | 86 const String& message, |
| 87 const String& url, | 87 const String& url, |
| 88 unsigned lineNumber, | 88 unsigned lineNumber, |
| 89 unsigned columnNumber, | 89 unsigned columnNumber, |
| 90 PassOwnPtr<V8StackTrace> stackTrace, | 90 std::unique_ptr<V8StackTrace> stackTrace, |
| 91 int scriptId, | 91 int scriptId, |
| 92 ScriptArguments* arguments) | 92 ScriptArguments* arguments) |
| 93 : m_source(source) | 93 : m_source(source) |
| 94 , m_level(level) | 94 , m_level(level) |
| 95 , m_type(LogMessageType) | 95 , m_type(LogMessageType) |
| 96 , m_message(message) | 96 , m_message(message) |
| 97 , m_scriptId(scriptId) | 97 , m_scriptId(scriptId) |
| 98 , m_url(url) | 98 , m_url(url) |
| 99 , m_lineNumber(lineNumber) | 99 , m_lineNumber(lineNumber) |
| 100 , m_columnNumber(columnNumber) | 100 , m_columnNumber(columnNumber) |
| (...skipping 94 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 |