mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly setup window object as global 

svn path=/trunk/netsurf/; revision=13987
This commit is contained in:
Vincent Sanders 2012-06-26 18:55:57 +00:00
parent bf27997312
commit 638e135c60
8 changed files with 322 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.sources
View File

@ -29,7 +29,8 @@ S_DESKTOP := cookies.c history_global_core.c hotlist.c knockout.c \
# Javascript sources
ifeq ($(NETSURF_USE_JS),YES)
S_JAVASCRIPT += jsapi.c jsapi/global.c content.c
S_JSAPI = window.c document.c console.c
S_JAVASCRIPT += content.c jsapi.c $(addprefix jsapi/,$(S_JSAPI))
else
S_JAVASCRIPT += none.c
endif

4
desktop/browser.c
View File

@ -1399,8 +1399,8 @@ nserror browser_window_callback(hlcache_handle *c,
/* only the content object created by the browser
* window requires a new global compartment object
*/
if (js_newcompartment(bw->jsctx,
hlcache_handle_get_content(c)) != NULL) {
assert(bw->loading_content == c);
if (js_newcompartment(bw->jsctx, bw, c) != NULL) {
*(event->data.jscontext) = bw->jsctx;
}
break;

17
javascript/js.h
View File

@ -26,14 +26,29 @@
typedef struct jscontext jscontext;
typedef struct jsobject jsobject;
/** Initialise javascript interpreter */
void js_initialise(void);
/** finalise javascript interpreter */
void js_finalise(void);
/** Create a new javascript context.
*
* There aare usually one context per browser context
*/
jscontext *js_newcontext(void);
/** Destroy a previously created context */
void js_destroycontext(jscontext *ctx);
jsobject *js_newcompartment(jscontext *ctx, struct content* c);
/** Create a new javascript compartment
*
* This is called once for a page with javascript script tags on
* it. It constructs a fresh global window object.
*/
jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv);
/* execute some javascript in a context */
bool js_exec(jscontext *ctx, const char *txt, int txtlen);
#endif /* _NETSURF_JAVASCRIPT_JS_H_ */

69
javascript/jsapi.c
View File

@ -92,60 +92,37 @@ void js_destroycontext(jscontext *ctx)
/* The class of the global object. */
static JSClass global_class = {
"global",
JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub,
JS_PropertyStub,
JS_PropertyStub,
#if JS_VERSION <= 180
JS_PropertyStub,
#else
JS_StrictPropertyStub,
#endif
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
jsobject *js_newcompartment(jscontext *ctx, struct content* c)
jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
{
JSContext *cx = (JSContext *)ctx;
JSObject *global;
if (cx == NULL) {
return NULL;
}
JSObject *window_obj = NULL;
JSObject *document_obj;
JSObject *console_obj;
#if JS_VERSION <= 180
global = JS_NewObject(cx, &global_class, NULL, NULL);
if (global == NULL) {
return NULL;
}
JS_SetGlobalObject(cx, global);
#else
global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
if (global == NULL) {
return NULL;
}
#endif
if (cx == NULL)
goto js_newcompartment_fail;
JS_SetContextPrivate(cx, c); /* private pointer to content */
/* create the window object as the global */
window_obj = jsapi_new_window(cx, NULL, win_priv);
if (window_obj == NULL)
goto js_newcompartment_fail;
jsapi_new_globalfunc(cx, global);
/* attach the subclasses off the window global */
document_obj = jsapi_new_document(cx, window_obj, doc_priv);
if (document_obj == NULL)
goto js_newcompartment_fail;
/* Populate the global object with the standard globals, like
Object and Array. */
if (!JS_InitStandardClasses(cx, global)) {
return NULL;
}
/* @todo forms, history, location */
LOG(("Created new global object %p", global));
console_obj = jsapi_new_console(cx, window_obj);
if (console_obj == NULL)
goto js_newcompartment_fail;
return (jsobject *)global;
return (jsobject *)window_obj;
js_newcompartment_fail:
return NULL;
}
bool js_exec(jscontext *ctx, const char *txt, int txtlen)

26
javascript/jsapi.h
View File

@ -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

141
javascript/jsapi/console.c Normal file
View File

@ -0,0 +1,141 @@
/*
* Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mozjs/jsapi.h"
#include "content/content.h"
#include "javascript/jsapi.h"
#include "utils/log.h"
static JSBool jsdebug(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jsdir(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jserror(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jsgroup(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jsgroupCollapsed(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jsgroupEnd(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jsinfo(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jslog(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jstime(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jstimeEnd(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jstrace(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSBool jswarn(JSContext *cx, uintN argc, jsval *vp)
{
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSFunctionSpec jsfunctions_console[] = {
JS_FS("debug", jsdebug, 1, 0),
JS_FS("dir", jsdir, 1, 0),
JS_FS("error", jserror, 1, 0),
JS_FS("group", jsgroup, 1, 0),
JS_FS("groupCollapsed", jsgroupCollapsed, 1, 0),
JS_FS("groupEnd", jsgroupEnd, 1, 0),
JS_FS("info", jsinfo, 1, 0),
JS_FS("log", jslog, 1, 0),
JS_FS("time", jstime, 1, 0),
JS_FS("timeEnd", jstimeEnd, 1, 0),
JS_FS("trace", jstrace, 1, 0),
JS_FS("warn", jswarn, 1, 0),
JS_FS_END
};
static JSClass jsclass_console =
{
"console",
JSCLASS_HAS_PRIVATE,
JS_PropertyStub,
JS_PropertyStub,
JS_PropertyStub,
JS_StrictPropertyStub,
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
JSObject *jsapi_new_console(JSContext *cx, JSObject *parent)
{
return JS_InitClass(cx,
parent,
NULL,
&jsclass_console,
NULL,
0,
NULL,
jsfunctions_console,
NULL,
NULL);
}

66
javascript/jsapi/document.c Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* NetSurf is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mozjs/jsapi.h"
#include "content/content.h"
#include "javascript/jsapi.h"
#include "utils/log.h"
static JSFunctionSpec jsfunctions_document[] = {
JS_FS_END
};
static JSClass jsclass_document =
{
"document",
JSCLASS_HAS_PRIVATE,
JS_PropertyStub,
JS_PropertyStub,
JS_PropertyStub,
JS_StrictPropertyStub,
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
JSObject *jsapi_new_document(JSContext *cx, JSObject *parent, void *doc_priv)
{
JSObject *doc;
doc = JS_InitClass(cx,
parent,
NULL,
&jsclass_document,
NULL,
0,
NULL,
jsfunctions_document,
NULL,
NULL);
if (doc == NULL) {
return NULL;
}
/* private pointer to browsing context */
if (!JS_SetPrivate(cx, doc, doc_priv))
return NULL;
return doc;
}

51
javascript/jsapi/global.c → javascript/jsapi/window.c
View File

@ -48,13 +48,58 @@ static JSBool jsalert(JSContext *cx, uintN argc, jsval *vp)
return JS_TRUE;
}
static JSFunctionSpec global_functions[] =
static JSFunctionSpec jsfunctions_window[] =
{
JS_FN("alert", jsalert, 1, 0),
JS_FS_END
};
bool jsapi_new_globalfunc(JSContext *cx, JSObject *global)
/* The class of the global object. */
static JSClass jsclass_window = {
"window",
JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub,
JS_PropertyStub,
JS_PropertyStub,
JS_StrictPropertyStub,
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
JSObject * jsapi_new_window(JSContext *cx, JSObject *parent, void *win_priv)
{
return JS_DefineFunctions(cx, global, global_functions);
JSObject *window = NULL;
if (parent == NULL) {
window = JS_NewCompartmentAndGlobalObject(cx, &jsclass_window, NULL);
if (window == NULL) {
return NULL;
}
/* Populate the global object with the standard globals, like
Object and Array. */
if (!JS_InitStandardClasses(cx, window)) {
return NULL;
}
} else {
/* @todo sort out windows that are not globals */
assert(false);
}
if (!JS_DefineFunctions(cx, window, jsfunctions_window)) {
return NULL;
}
/* private pointer to browsing context */
if (!JS_SetPrivate(cx, window, win_priv))
return NULL;
LOG(("Created new window object %p", window));
return window;
}