summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/API/JSContextInternal.h
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-08-25 19:20:41 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-02-02 12:30:55 +0000
commit6882a04fb36642862b11efe514251d32070c3d65 (patch)
treeb7959826000b061fd5ccc7512035c7478742f7b0 /Source/JavaScriptCore/API/JSContextInternal.h
parentab6df191029eeeb0b0f16f127d553265659f739e (diff)
downloadqtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/API/JSContextInternal.h')
-rw-r--r--Source/JavaScriptCore/API/JSContextInternal.h4
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;