diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/inspector/ConsoleMessage.cpp | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/inspector/ConsoleMessage.cpp')
-rw-r--r-- | Source/WebCore/inspector/ConsoleMessage.cpp | 56 |
1 files changed, 49 insertions, 7 deletions
diff --git a/Source/WebCore/inspector/ConsoleMessage.cpp b/Source/WebCore/inspector/ConsoleMessage.cpp index de61ef8..5ced69a 100644 --- a/Source/WebCore/inspector/ConsoleMessage.cpp +++ b/Source/WebCore/inspector/ConsoleMessage.cpp @@ -86,18 +86,60 @@ ConsoleMessage::~ConsoleMessage() { } +// Keep in sync with inspector/front-end/ConsoleView.js +static String messageSourceValue(MessageSource source) +{ + switch (source) { + case HTMLMessageSource: return "html"; + case WMLMessageSource: return "wml"; + case XMLMessageSource: return "xml"; + case JSMessageSource: return "javascript"; + case CSSMessageSource: return "css"; + case OtherMessageSource: return "other"; + } + return "other"; +} + +static String messageTypeValue(MessageType type) +{ + switch (type) { + case LogMessageType: return "log"; + case ObjectMessageType: return "other"; + case TraceMessageType: return "trace"; + case StartGroupMessageType: return "startGroup"; + case StartGroupCollapsedMessageType: return "startGroupCollapsed"; + case EndGroupMessageType: return "endGroup"; + case AssertMessageType: return "assert"; + case UncaughtExceptionMessageType: return "uncaughtException"; + case NetworkErrorMessageType: return "networkError"; + } + return "other"; +} + +static String messageLevelValue(MessageLevel level) +{ + switch (level) { + case TipMessageLevel: return "tip"; + case LogMessageLevel: return "log"; + case WarningMessageLevel: return "warning"; + case ErrorMessageLevel: return "error"; + case DebugMessageLevel: return "debug"; + } + return "log"; +} + void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager) { RefPtr<InspectorObject> jsonObj = InspectorObject::create(); - jsonObj->setNumber("source", static_cast<int>(m_source)); - jsonObj->setNumber("type", static_cast<int>(m_type)); - jsonObj->setNumber("level", static_cast<int>(m_level)); + jsonObj->setString("source", messageSourceValue(m_source)); + jsonObj->setString("type", messageTypeValue(m_type)); + jsonObj->setString("level", messageLevelValue(m_level)); jsonObj->setNumber("line", static_cast<int>(m_line)); jsonObj->setString("url", m_url); jsonObj->setNumber("repeatCount", static_cast<int>(m_repeatCount)); - jsonObj->setString("message", m_message); + jsonObj->setString("text", m_message); if (m_type == NetworkErrorMessageType) - jsonObj->setNumber("requestId", m_requestId); + jsonObj->setNumber("networkIdentifier", m_requestId); if (m_arguments && m_arguments->argumentCount()) { InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState()); if (!injectedScript.hasNoValue()) { @@ -115,12 +157,12 @@ void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, Injecte } if (m_callStack) jsonObj->setArray("stackTrace", m_callStack->buildInspectorArray()); - frontend->consoleMessage(jsonObj); + frontend->messageAdded(jsonObj); } void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend::Console* frontend) { - frontend->consoleMessageRepeatCountUpdated(m_repeatCount); + frontend->messageRepeatCountUpdated(m_repeatCount); } bool ConsoleMessage::isEqual(ConsoleMessage* msg) const |