Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/c0aaf31f5a9a65808d8b7... ...commit http://git.netsurf-browser.org/netsurf.git/commit/c0aaf31f5a9a65808d8b7af... ...tree http://git.netsurf-browser.org/netsurf.git/tree/c0aaf31f5a9a65808d8b7af92... The branch, vince/script-async has been updated via c0aaf31f5a9a65808d8b7af92434608135ccc752 (commit) via d763e57d30dc8c68309c5b35f556531cb8346da5 (commit) from 4182685d1e90e082407a8e40a0b1db76cf9fbea2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/c0aaf31f5a9a65808d8... commit c0aaf31f5a9a65808d8b7af92434608135ccc752 Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; fix global handling diff --git a/javascript/jsapi.h b/javascript/jsapi.h index cf099cc..a44323f 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -79,7 +79,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, if (global == NULL) { return NULL; } - JS_SetGlobalObject(cx, global); return global; } diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c index dfad551..bb5019c 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 06e6cdf..0b7673b 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; } commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/d763e57d30dc8c68309... commit d763e57d30dc8c68309c5b35f556531cb8346da5 Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; fix dom parser error return check diff --git a/render/html_script.c b/render/html_script.c index 7222f80..f4d80ab 100644 --- a/render/html_script.c +++ b/render/html_script.c @@ -483,7 +483,7 @@ exec_src_script(html_content *c, switch (script_type) { case HTML_SCRIPT_SYNC: - ret = DOM_HUBBUB_PAUSED; + ret = DOM_HUBBUB_HUBBUB_ERR | HUBBUB_PAUSED; case HTML_SCRIPT_ASYNC: break; ----------------------------------------------------------------------- Summary of changes: javascript/jsapi.h | 1 - javascript/jsapi/document.c | 4 +++- javascript/jsapi/window.c | 12 +++++++++++- render/html_script.c | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/javascript/jsapi.h b/javascript/jsapi.h index cf099cc..a44323f 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -79,7 +79,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, if (global == NULL) { return NULL; } - JS_SetGlobalObject(cx, global); return global; } diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c index dfad551..bb5019c 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 06e6cdf..0b7673b 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; } diff --git a/render/html_script.c b/render/html_script.c index 7222f80..f4d80ab 100644 --- a/render/html_script.c +++ b/render/html_script.c @@ -483,7 +483,7 @@ exec_src_script(html_content *c, switch (script_type) { case HTML_SCRIPT_SYNC: - ret = DOM_HUBBUB_PAUSED; + ret = DOM_HUBBUB_HUBBUB_ERR | HUBBUB_PAUSED; case HTML_SCRIPT_ASYNC: break; -- NetSurf Browser