diff options
author | ninerider <qt-info@nokia.com> | 2009-10-01 11:11:56 (GMT) |
---|---|---|
committer | ninerider <qt-info@nokia.com> | 2009-10-01 11:11:56 (GMT) |
commit | c443a37d638be253fbda33e33ad2798951e04248 (patch) | |
tree | 89a9d221ead07d029f0bbddcaeaf7432b8c6d4af /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | |
parent | c7689f394df5fa5526e51017bf132048d3a4aa96 (diff) | |
parent | 3b37aff1e6c641290c155a6aa14d83167725556b (diff) | |
download | Qt-c443a37d638be253fbda33e33ad2798951e04248.zip Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.gz Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index 5ded370..dc32718 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -286,12 +286,12 @@ JSValue JSC_HOST_CALL globalFuncEval(ExecState* exec, JSObject* function, JSValu if (JSValue parsedObject = preparser.tryLiteralParse()) return parsedObject; - EvalExecutable eval(exec, makeSource(s)); - JSObject* error = eval.compile(exec, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node()); + RefPtr<EvalExecutable> eval = EvalExecutable::create(exec, makeSource(s)); + JSObject* error = eval->compile(exec, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node()); if (error) return throwError(exec, error); - return exec->interpreter()->execute(&eval, exec, thisObject, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node(), exec->exceptionSlot()); + return exec->interpreter()->execute(eval.get(), exec, thisObject, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node(), exec->exceptionSlot()); } JSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec, JSObject*, JSValue, const ArgList& args) |