diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/JavaScriptCore/bindings/ScriptFunctionCall.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/JavaScriptCore/bindings/ScriptFunctionCall.h')
| -rw-r--r-- | Source/JavaScriptCore/bindings/ScriptFunctionCall.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/bindings/ScriptFunctionCall.h b/Source/JavaScriptCore/bindings/ScriptFunctionCall.h index 04b2afe07..6978414e4 100644 --- a/Source/JavaScriptCore/bindings/ScriptFunctionCall.h +++ b/Source/JavaScriptCore/bindings/ScriptFunctionCall.h @@ -29,8 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScriptFunctionCall_h -#define ScriptFunctionCall_h +#pragma once #include "ArgList.h" #include "ScriptObject.h" @@ -46,8 +45,6 @@ class JS_EXPORT_PRIVATE ScriptCallArgumentHandler { public: ScriptCallArgumentHandler(JSC::ExecState* state) : m_exec(state) { } - void appendArgument(const ScriptObject&); - void appendArgument(const ScriptValue&); void appendArgument(const char*); void appendArgument(const String&); void appendArgument(JSC::JSValue); @@ -71,10 +68,10 @@ private: class JS_EXPORT_PRIVATE ScriptFunctionCall : public ScriptCallArgumentHandler { public: - typedef JSC::JSValue (*ScriptFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args); + typedef JSC::JSValue (*ScriptFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>&); ScriptFunctionCall(const ScriptObject& thisObject, const String& name, ScriptFunctionCallHandler handler = nullptr); - ScriptValue call(bool& hadException); - ScriptValue call(); + JSC::JSValue call(bool& hadException); + JSC::JSValue call(); protected: ScriptFunctionCallHandler m_callHandler; @@ -83,5 +80,3 @@ protected: }; } // namespace Deprecated - -#endif // ScriptFunctionCall |