diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/API/JSContextInternal.h | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/JavaScriptCore/API/JSContextInternal.h')
| -rw-r--r-- | Source/JavaScriptCore/API/JSContextInternal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/API/JSContextInternal.h b/Source/JavaScriptCore/API/JSContextInternal.h index d08e97d93..5308fbb92 100644 --- a/Source/JavaScriptCore/API/JSContextInternal.h +++ b/Source/JavaScriptCore/API/JSContextInternal.h @@ -36,8 +36,8 @@ struct CallbackData { CallbackData *next; JSContext *context; JSValue *preservedException; + JSValueRef calleeValue; JSValueRef thisValue; - JSValue *currentThis; size_t argumentCount; const JSValueRef *arguments; NSArray *currentArguments; @@ -65,7 +65,7 @@ private: - (JSValue *)valueFromNotifyException:(JSValueRef)exception; - (BOOL)boolFromNotifyException:(JSValueRef)exception; -- (void)beginCallbackWithData:(CallbackData *)callbackData thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments; +- (void)beginCallbackWithData:(CallbackData *)callbackData calleeValue:(JSValueRef)calleeValue thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments; - (void)endCallbackWithData:(CallbackData *)callbackData; - (JSValue *)wrapperForObjCObject:(id)object; |