correctly setup window object as global

svn path=/trunk/netsurf/; revision=13987

3 files changed, 255 insertions, 3 deletions

diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c
new file mode 100644
index 000000000..8621d810c
--- /dev/null
+++ b/javascript/jsapi/console.c
@@ -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);
+}
diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
new file mode 100644
index 000000000..fe13af13e
--- /dev/null
+++ b/javascript/jsapi/document.c
@@ -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;
+}
diff --git a/javascript/jsapi/global.c b/javascript/jsapi/window.c
index b86400428..e9c815792 100644
--- a/javascript/jsapi/global.c
+++ b/javascript/jsapi/window.c
@@ -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;
 }