diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/inspector/InjectedScript.cpp | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/inspector/InjectedScript.cpp')
| -rw-r--r-- | WebCore/inspector/InjectedScript.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/inspector/InjectedScript.cpp b/WebCore/inspector/InjectedScript.cpp index 2e35e4b..5f2fb74 100644 --- a/WebCore/inspector/InjectedScript.cpp +++ b/WebCore/inspector/InjectedScript.cpp @@ -33,6 +33,7 @@ #if ENABLE(INSPECTOR) +#include "InspectorValues.h" #include "PlatformString.h" #include "SerializedScriptValue.h" #include "ScriptFunctionCall.h" @@ -73,7 +74,7 @@ PassRefPtr<SerializedScriptValue> InjectedScript::callFrames() } #endif -PassRefPtr<SerializedScriptValue> InjectedScript::wrapForConsole(ScriptValue value) +PassRefPtr<InspectorValue> InjectedScript::wrapForConsole(ScriptValue value) { ASSERT(!hasNoValue()); ScriptFunctionCall wrapFunction(m_injectedScriptObject, "wrapObjectForConsole"); @@ -82,8 +83,8 @@ PassRefPtr<SerializedScriptValue> InjectedScript::wrapForConsole(ScriptValue val bool hadException = false; ScriptValue r = wrapFunction.call(hadException); if (hadException) - return SerializedScriptValue::create("<exception>"); - return r.serialize(m_injectedScriptObject.scriptState()); + return InspectorString::create("<exception>"); + return r.toInspectorValue(m_injectedScriptObject.scriptState()); } void InjectedScript::releaseWrapperObjectGroup(const String& objectGroup) |