diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 08:09:08 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 08:09:37 (GMT) |
commit | f2f593c68f5c4e63fb78cf789f94ed2d42522498 (patch) | |
tree | 718a3371fa3acd294b94f22517590343caf35247 /src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp | |
parent | cefaaf4cfcd8e4f75539d303ac10185427e193a8 (diff) | |
download | Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.zip Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.tar.gz Qt-f2f593c68f5c4e63fb78cf789f94ed2d42522498.tar.bz2 |
add ifdefs for qtscript-specific changes
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp index 74ef191..f13be43 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.cpp @@ -25,8 +25,10 @@ #include "config.h" #include "CallData.h" +#ifdef QT_BUILD_SCRIPT_LIB #include "ExceptionHelpers.h" #include "Interpreter.h" +#endif #include "JSFunction.h" @@ -35,6 +37,7 @@ namespace JSC { JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args) { if (callType == CallTypeHost) { +#ifdef QT_BUILD_SCRIPT_LIB ScopeChainNode* scopeChain = exec->scopeChain(); Interpreter *interp = exec->interpreter(); Register *oldEnd = interp->registerFile().end(); @@ -52,6 +55,9 @@ JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const C JSValue result = callData.native.function(newCallFrame, asObject(functionObject), thisValue, args); interp->registerFile().shrink(oldEnd); return result; +#else + return callData.native.function(exec, asObject(functionObject), thisValue, args); +#endif } ASSERT(callType == CallTypeJS); // FIXME: Can this be done more efficiently using the callData? |