From 638e135c60f9a773b3a95bb9cbd0b50e105f6668 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 26 Jun 2012 18:55:57 +0000 Subject: correctly setup window object as global svn path=/trunk/netsurf/; revision=13987 --- javascript/jsapi.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'javascript/jsapi.h') diff --git a/javascript/jsapi.h b/javascript/jsapi.h index ce2051148..61dc82c81 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -17,12 +17,34 @@ */ /** \file - * spidermonkey jsapi bindings. + * spidermonkey jsapi bindings and compatability glue. */ #ifndef _NETSURF_JAVASCRIPT_JSAPI_H_ #define _NETSURF_JAVASCRIPT_JSAPI_H_ -bool jsapi_new_globalfunc(JSContext *cx, JSObject *global); +#if JS_VERSION <= 180 +inline JSObject * +JS_NewCompartmentAndGlobalObject(JSContext *cx, + JSClass *jsclass, + JSPrincipals *principals) +{ + JSObject *global; + global = JS_NewObject(cx, jsclass, NULL, NULL); + if (global == NULL) { + return NULL; + } + JS_SetGlobalObject(cx, global); + return global; +} + +#define JS_StrictPropertyStub JS_PropertyStub + +#endif + + +JSObject *jsapi_new_window(JSContext *cx, JSObject *parent, void *win_priv); +JSObject *jsapi_new_document(JSContext *cx, JSObject *parent, void *doc_priv); +JSObject *jsapi_new_console(JSContext *cx, JSObject *parent); #endif -- cgit v1.2.3