summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
-rw-r--r--src/script/api/qscriptengine.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index de759c6..216f325 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1137,7 +1137,7 @@ void QScriptEnginePrivate::mark(JSC::MarkStack& markStack)
QScriptContext *context = q->currentContext();
while (context) {
- JSC::ScopeChainNode *node = ((JSC::ExecState *)context)->scopeChain();
+ JSC::ScopeChainNode *node = frameForContext(context)->scopeChain();
JSC::ScopeChainIterator it(node);
for (it = node->begin(); it != node->end(); ++it) {
JSC::JSObject *object = *it;
@@ -2288,35 +2288,6 @@ QScriptContext *QScriptEngine::pushContext()
return d->contextForFrame(newFrame);
}
-/*!
- Enters a new execution context and returns the associated
- QScriptContext object.
-
- Once you are done with the context, you should call popContext() to
- restore the old context.
-
- By default, the `this' object of the new context is the Global Object.
- The context's \l{QScriptContext::callee()}{callee}() will be invalid.
-
- Unlike pushContext(), the default scope chain is reset to include
- only the global object and the QScriptContext's activation object.
-
- \sa popContext()
-*/
-QScriptContext *QScriptEngine::pushCleanContext()
-{
- Q_D(QScriptEngine);
-
- JSC::CallFrame* newFrame = d->pushContext(d->currentFrame, d->currentFrame->globalData().dynamicGlobalObject,
- JSC::ArgList(), /*callee = */0, false, true);
-
- if (agent())
- agent()->contextPush();
-
- return d->contextForFrame(newFrame);
-}
-
-
/*! \internal
push a context for a native function.
JSC native function doesn't have different stackframe or context. so we need to create one.