summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-07-08 11:38:17 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-07-08 16:17:36 (GMT)
commitccda28f5fa5b38a8e7096742202d64bec4fef54c (patch)
tree9946f8bc5d2dc439f05f2ac9e883624a5e14b501 /src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h
parentd47ea38c927d488b83708564f2e79b09cd631b9f (diff)
downloadQt-ccda28f5fa5b38a8e7096742202d64bec4fef54c.zip
Qt-ccda28f5fa5b38a8e7096742202d64bec4fef54c.tar.gz
Qt-ccda28f5fa5b38a8e7096742202d64bec4fef54c.tar.bz2
make JSC::CallFrame::callee() an InternalFunction
This makes it possible to obtain the callee for native (host) functions as well.
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h
index 0b0e5fe..b1e6c4d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h
@@ -37,7 +37,7 @@ namespace JSC {
// Passed as the first argument to most functions.
class ExecState : private Register {
public:
- JSFunction* callee() const { return this[RegisterFile::Callee].function(); }
+ InternalFunction* callee() const { return this[RegisterFile::Callee].function(); }
CodeBlock* codeBlock() const { return this[RegisterFile::CodeBlock].Register::codeBlock(); }
ScopeChainNode* scopeChain() const { return this[RegisterFile::ScopeChain].Register::scopeChain(); }
int argumentCount() const { return this[RegisterFile::ArgumentCount].i(); }
@@ -110,7 +110,7 @@ namespace JSC {
void setScopeChain(ScopeChainNode* scopeChain) { this[RegisterFile::ScopeChain] = scopeChain; }
ALWAYS_INLINE void init(CodeBlock* codeBlock, Instruction* vPC, ScopeChainNode* scopeChain,
- CallFrame* callerFrame, int returnValueRegister, int argc, JSFunction* function)
+ CallFrame* callerFrame, int returnValueRegister, int argc, InternalFunction* function)
{
ASSERT(callerFrame); // Use noCaller() rather than 0 for the outer host call frame caller.
@@ -134,7 +134,7 @@ namespace JSC {
int returnValueRegister() const { return this[RegisterFile::ReturnValueRegister].i(); }
void setArgumentCount(int count) { this[RegisterFile::ArgumentCount] = count; }
- void setCallee(JSFunction* callee) { this[RegisterFile::Callee] = callee; }
+ void setCallee(InternalFunction* callee) { this[RegisterFile::Callee] = callee; }
void setCodeBlock(CodeBlock* codeBlock) { this[RegisterFile::CodeBlock] = codeBlock; }
static const intptr_t HostCallFrameFlag = 1;