| 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 "core/inspector/ScriptArguments.h" | 9 #include "core/inspector/ScriptArguments.h" |
| 10 #include "core/workers/WorkerInspectorProxy.h" | 10 #include "core/workers/WorkerInspectorProxy.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 unsigned ConsoleMessage::lineNumber() const | 83 unsigned ConsoleMessage::lineNumber() const |
| 84 { | 84 { |
| 85 return m_lineNumber; | 85 return m_lineNumber; |
| 86 } | 86 } |
| 87 | 87 |
| 88 void ConsoleMessage::setLineNumber(unsigned lineNumber) | 88 void ConsoleMessage::setLineNumber(unsigned lineNumber) |
| 89 { | 89 { |
| 90 m_lineNumber = lineNumber; | 90 m_lineNumber = lineNumber; |
| 91 } | 91 } |
| 92 | 92 |
| 93 unsigned ConsoleMessage::columnNumber() const |
| 94 { |
| 95 return m_columnNumber; |
| 96 } |
| 97 |
| 98 void ConsoleMessage::setColumnNumber(unsigned columnNumber) |
| 99 { |
| 100 m_columnNumber = columnNumber; |
| 101 } |
| 102 |
| 93 PassRefPtr<ScriptCallStack> ConsoleMessage::callStack() const | 103 PassRefPtr<ScriptCallStack> ConsoleMessage::callStack() const |
| 94 { | 104 { |
| 95 return m_callStack; | 105 return m_callStack; |
| 96 } | 106 } |
| 97 | 107 |
| 98 void ConsoleMessage::setCallStack(PassRefPtr<ScriptCallStack> callStack) | 108 void ConsoleMessage::setCallStack(PassRefPtr<ScriptCallStack> callStack) |
| 99 { | 109 { |
| 100 m_callStack = callStack; | 110 m_callStack = callStack; |
| 101 if (m_callStack && !m_callStack->isEmpty() && !m_scriptId) { | 111 if (m_callStack && !m_callStack->isEmpty() && !m_scriptId) { |
| 102 m_url = m_callStack->topSourceURL(); | 112 m_url = m_callStack->topSourceURL(); |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 MessageLevel ConsoleMessage::level() const | 178 MessageLevel ConsoleMessage::level() const |
| 169 { | 179 { |
| 170 return m_level; | 180 return m_level; |
| 171 } | 181 } |
| 172 | 182 |
| 173 const String& ConsoleMessage::message() const | 183 const String& ConsoleMessage::message() const |
| 174 { | 184 { |
| 175 return m_message; | 185 return m_message; |
| 176 } | 186 } |
| 177 | 187 |
| 178 unsigned ConsoleMessage::columnNumber() const | |
| 179 { | |
| 180 return m_columnNumber; | |
| 181 } | |
| 182 | |
| 183 void ConsoleMessage::frameWindowDiscarded(LocalDOMWindow* window) | 188 void ConsoleMessage::frameWindowDiscarded(LocalDOMWindow* window) |
| 184 { | 189 { |
| 185 if (getScriptState() && getScriptState()->domWindow() == window) | 190 if (getScriptState() && getScriptState()->domWindow() == window) |
| 186 setScriptState(nullptr); | 191 setScriptState(nullptr); |
| 187 | 192 |
| 188 if (!m_scriptArguments) | 193 if (!m_scriptArguments) |
| 189 return; | 194 return; |
| 190 if (m_scriptArguments->getScriptState()->domWindow() != window) | 195 if (m_scriptArguments->getScriptState()->domWindow() != window) |
| 191 return; | 196 return; |
| 192 if (!m_message) | 197 if (!m_message) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 210 setCallStack(ScriptCallStack::captureForConsole()); | 215 setCallStack(ScriptCallStack::captureForConsole()); |
| 211 } | 216 } |
| 212 | 217 |
| 213 DEFINE_TRACE(ConsoleMessage) | 218 DEFINE_TRACE(ConsoleMessage) |
| 214 { | 219 { |
| 215 visitor->trace(m_scriptArguments); | 220 visitor->trace(m_scriptArguments); |
| 216 visitor->trace(m_workerProxy); | 221 visitor->trace(m_workerProxy); |
| 217 } | 222 } |
| 218 | 223 |
| 219 } // namespace blink | 224 } // namespace blink |
| OLD | NEW |