diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/ConsoleMessage.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/ConsoleMessage.cpp')
| -rw-r--r-- | Source/WebCore/inspector/ConsoleMessage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/inspector/ConsoleMessage.cpp b/Source/WebCore/inspector/ConsoleMessage.cpp index 63fb020..de61ef8 100644 --- a/Source/WebCore/inspector/ConsoleMessage.cpp +++ b/Source/WebCore/inspector/ConsoleMessage.cpp @@ -35,7 +35,7 @@ #include "Console.h" #include "InjectedScript.h" -#include "InjectedScriptHost.h" +#include "InjectedScriptManager.h" #include "InspectorFrontend.h" #include "InspectorValues.h" #include "ScriptArguments.h" @@ -86,7 +86,7 @@ ConsoleMessage::~ConsoleMessage() { } -void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptHost* injectedScriptHost) +void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager) { RefPtr<InspectorObject> jsonObj = InspectorObject::create(); jsonObj->setNumber("source", static_cast<int>(m_source)); @@ -99,7 +99,7 @@ void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, Injecte if (m_type == NetworkErrorMessageType) jsonObj->setNumber("requestId", m_requestId); if (m_arguments && m_arguments->argumentCount()) { - InjectedScript injectedScript = injectedScriptHost->injectedScriptFor(m_arguments->globalState()); + InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState()); if (!injectedScript.hasNoValue()) { RefPtr<InspectorArray> jsonArgs = InspectorArray::create(); for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) { @@ -114,13 +114,13 @@ void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, Injecte } } if (m_callStack) - jsonObj->setArray("stackTrace", m_callStack->buildInspectorObject()); - frontend->addConsoleMessage(jsonObj); + jsonObj->setArray("stackTrace", m_callStack->buildInspectorArray()); + frontend->consoleMessage(jsonObj); } void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend::Console* frontend) { - frontend->updateConsoleMessageRepeatCount(m_repeatCount); + frontend->consoleMessageRepeatCountUpdated(m_repeatCount); } bool ConsoleMessage::isEqual(ConsoleMessage* msg) const |