diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp b/src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp index b3c0218a92..609197ef84 100644 --- a/src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/ConsoleMessage.cpp @@ -38,8 +38,9 @@ namespace WebCore { -ConsoleMessage::ConsoleMessage(MessageSource s, MessageLevel l, const String& m, unsigned li, const String& u, unsigned g) +ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, unsigned li, const String& u, unsigned g) : m_source(s) + , m_type(t) , m_level(l) , m_message(m) , m_line(li) @@ -49,8 +50,9 @@ ConsoleMessage::ConsoleMessage(MessageSource s, MessageLevel l, const String& m, { } -ConsoleMessage::ConsoleMessage(MessageSource s, MessageLevel l, ScriptCallStack* callStack, unsigned g, bool storeTrace) +ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, ScriptCallStack* callStack, unsigned g, bool storeTrace) : m_source(s) + , m_type(t) , m_level(l) , m_wrappedArguments(callStack->at(0).argumentCount()) , m_frames(storeTrace ? callStack->size() : 0) @@ -77,6 +79,7 @@ void ConsoleMessage::addToConsole(InspectorFrontend* frontend) { InspectorJSONObject jsonObj = frontend->newInspectorJSONObject(); jsonObj.set("source", static_cast<int>(m_source)); + jsonObj.set("type", static_cast<int>(m_type)); jsonObj.set("level", static_cast<int>(m_level)); jsonObj.set("line", static_cast<int>(m_line)); jsonObj.set("url", m_url); @@ -109,6 +112,7 @@ bool ConsoleMessage::isEqual(ScriptState* state, ConsoleMessage* msg) const } return msg->m_source == m_source + && msg->m_type == m_type && msg->m_level == m_level && msg->m_message == m_message && msg->m_line == m_line |