diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-06-16 16:07:42 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-06-16 16:07:42 (GMT) |
| commit | 65c2d095cddfda32052925654dd1defd314ad4b3 (patch) | |
| tree | 222ac5b04cd1c7a273b0c22d01d0ff3682d5d2d3 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h | |
| parent | f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5 (diff) | |
| parent | d9308550f104526d29b1cdd56514ae3bb967d7f9 (diff) | |
| download | Qt-65c2d095cddfda32052925654dd1defd314ad4b3.zip Qt-65c2d095cddfda32052925654dd1defd314ad4b3.tar.gz Qt-65c2d095cddfda32052925654dd1defd314ad4b3.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h index 46f6fcc..7dd87b5 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackFunction.h @@ -39,7 +39,7 @@ public: // InternalFunction mish-mashes constructor and function behavior -- we should // refactor the code so this override isn't necessary - static PassRefPtr<Structure> createStructure(JSValuePtr proto) + static PassRefPtr<Structure> createStructure(JSValue proto) { return Structure::create(proto, TypeInfo(ObjectType, HasStandardGetOwnPropertySlot)); } @@ -48,7 +48,7 @@ private: virtual CallType getCallData(CallData&); virtual const ClassInfo* classInfo() const { return &info; } - static JSValuePtr call(ExecState*, JSObject*, JSValuePtr, const ArgList&); + static JSValue JSC_HOST_CALL call(ExecState*, JSObject*, JSValue, const ArgList&); JSObjectCallAsFunctionCallback m_callback; }; |