summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/javascriptcore/JavaScriptCore/debugger
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-10-05 11:47:52 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-10-05 11:53:40 (GMT)
commit502c7d324141fb48a902ef475b4fd2932dc859c5 (patch)
tree6a748d9a12e2b693727468aa381c8b8bfa3fc72f /src/3rdparty/javascriptcore/JavaScriptCore/debugger
parentb2ea3433f4a42e367fd0708f0198329754903086 (diff)
downloadQt-502c7d324141fb48a902ef475b4fd2932dc859c5.zip
Qt-502c7d324141fb48a902ef475b4fd2932dc859c5.tar.gz
Qt-502c7d324141fb48a902ef475b4fd2932dc859c5.tar.bz2
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c )
Adapt src/script to src/3rdparty/javascriptcore changes
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/debugger')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/debugger/Debugger.cpp2
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/debugger/DebuggerCallFrame.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/debugger/Debugger.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/debugger/Debugger.cpp
index 61167d4..db02329 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/debugger/Debugger.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/debugger/Debugger.cpp
@@ -100,7 +100,7 @@ JSValue evaluateInGlobalCallFrame(const UString& script, JSValue& exception, JSG
{
CallFrame* globalCallFrame = globalObject->globalExec();
- EvalExecutable eval(makeSource(script));
+ EvalExecutable eval(globalCallFrame, makeSource(script));
JSObject* error = eval.compile(globalCallFrame, globalCallFrame->scopeChain());
if (error)
return error;
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/debugger/DebuggerCallFrame.cpp
index 9c8ca2a..88b14e6 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/debugger/DebuggerCallFrame.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/debugger/DebuggerCallFrame.cpp
@@ -79,7 +79,7 @@ JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) c
if (!m_callFrame->codeBlock())
return JSValue();
- EvalExecutable eval(makeSource(script));
+ EvalExecutable eval(m_callFrame, makeSource(script));
JSObject* error = eval.compile(m_callFrame, m_callFrame->scopeChain());
if (error)
return error;