From c0aaf31f5a9a65808d8b7af92434608135ccc752 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 31 Jul 2012 14:48:53 +0100 Subject: fix global handling --- javascript/jsapi/document.c | 4 +++- javascript/jsapi/window.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'javascript/jsapi') diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c index dfad551d6..bb5019c4b 100644 --- a/javascript/jsapi/document.c +++ b/javascript/jsapi/document.c @@ -92,8 +92,10 @@ JSObject *jsapi_new_document(JSContext *cx, JSObject *parent, void *doc_priv) LOG(("setting content to %p",doc_priv)); /* private pointer to browsing context */ - if (!JS_SetPrivate(cx, doc, doc_priv)) + if (JS_SetPrivate(cx, doc, doc_priv) != JS_TRUE) { + LOG(("failed to set content")); return NULL; + } return doc; } diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c index 06e6cdfe8..0b7673be3 100644 --- a/javascript/jsapi/window.c +++ b/javascript/jsapi/window.c @@ -299,8 +299,18 @@ JSObject * jsapi_new_window(JSContext *cx, JSObject *parent, void *win_priv) return NULL; } + /** @todo reconsider global object handling. future + * editions of spidermonkey appear to be removing the + * idea of a global so we probably need to handle + * global object references internally + */ + + /* set the contexts global */ + JS_SetGlobalObject(cx, window); + /* Populate the global object with the standard globals, like - Object and Array. */ + * Object and Array. + */ if (!JS_InitStandardClasses(cx, window)) { return NULL; } -- cgit v1.2.3