[spidermonkey] collection in separate file

src/ecmascript/spidermonkey/Makefile

@@ -2,7 +2,7 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-OBJS = attr.o attributes.o console.o css2xpath.o document.o element.o form.o heartbeat.o implementation.o location.o \
+OBJS = attr.o attributes.o collection.o console.o css2xpath.o document.o element.o form.o heartbeat.o implementation.o location.o \
 	localstorage.o localstorage-db.o navigator.o nodelist.o screen.o unibar.o window.o
 
 include $(top_srcdir)/Makefile.lib

src/ecmascript/spidermonkey/collection.c

@@ -0,0 +1,444 @@
+/* The SpiderMonkey html collection object implementation. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "elinks.h"
+
+#include "ecmascript/spidermonkey/util.h"
+#include <jsfriendapi.h>
+
+#include "bfu/dialog.h"
+#include "cache/cache.h"
+#include "cookies/cookies.h"
+#include "dialogs/menu.h"
+#include "dialogs/status.h"
+#include "document/html/frames.h"
+#include "document/document.h"
+#include "document/forms.h"
+#include "document/view.h"
+#include "ecmascript/ecmascript.h"
+#include "ecmascript/spidermonkey/collection.h"
+#include "ecmascript/spidermonkey/element.h"
+#include "intl/libintl.h"
+#include "main/select.h"
+#include "osdep/newwin.h"
+#include "osdep/sysname.h"
+#include "protocol/http/http.h"
+#include "protocol/uri.h"
+#include "session/history.h"
+#include "session/location.h"
+#include "session/session.h"
+#include "session/task.h"
+#include "terminal/tab.h"
+#include "terminal/terminal.h"
+#include "util/conv.h"
+#include "util/memory.h"
+#include "util/string.h"
+#include "viewer/text/draw.h"
+#include "viewer/text/form.h"
+#include "viewer/text/link.h"
+#include "viewer/text/vs.h"
+
+#include <libxml/tree.h>
+#include <libxml/HTMLparser.h>
+#include <libxml++/libxml++.h>
+#include <libxml++/attributenode.h>
+#include <libxml++/parsers/domparser.h>
+
+#include <iostream>
+#include <algorithm>
+#include <string>
+
+
+static bool htmlCollection_item(JSContext *ctx, unsigned int argc, JS::Value *rval);
+static bool htmlCollection_namedItem(JSContext *ctx, unsigned int argc, JS::Value *rval);
+static bool htmlCollection_get_property(JSContext *ctx, JS::HandleObject hobj, JS::HandleId hid, JS::MutableHandleValue hvp);
+static bool htmlCollection_item2(JSContext *ctx, JS::HandleObject hobj, int index, JS::MutableHandleValue hvp);
+static bool htmlCollection_namedItem2(JSContext *ctx, JS::HandleObject hobj, char *str, JS::MutableHandleValue hvp);
+
+static void htmlCollection_finalize(JSFreeOp *op, JSObject *obj)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+}
+
+
+JSClassOps htmlCollection_ops = {
+	nullptr,  // addProperty
+	nullptr,  // deleteProperty
+	nullptr,  // enumerate
+	nullptr,  // newEnumerate
+	nullptr,  // resolve
+	nullptr,  // mayResolve
+	htmlCollection_finalize, // finalize
+	nullptr,  // call
+	nullptr,  // hasInstance
+	nullptr,  // construct
+	JS_GlobalObjectTraceHook
+};
+
+JSClass htmlCollection_class = {
+	"htmlCollection",
+	JSCLASS_HAS_PRIVATE,
+	&htmlCollection_ops
+};
+
+static const spidermonkeyFunctionSpec htmlCollection_funcs[] = {
+	{ "item",		htmlCollection_item,		1 },
+	{ "namedItem",		htmlCollection_namedItem,	1 },
+	{ NULL }
+};
+
+static bool htmlCollection_get_property_length(JSContext *ctx, unsigned int argc, JS::Value *vp);
+
+static JSPropertySpec htmlCollection_props[] = {
+	JS_PSG("length",	htmlCollection_get_property_length, JSPROP_ENUMERATE),
+	JS_PS_END
+};
+
+static bool
+htmlCollection_get_property_length(JSContext *ctx, unsigned int argc, JS::Value *vp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JS::CallArgs args = CallArgsFromVp(argc, vp);
+	JS::RootedObject hobj(ctx, &args.thisv().toObject());
+
+	struct view_state *vs;
+	JS::Realm *comp = js::GetContextRealm(ctx);
+
+	if (!comp) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
+
+	/* This can be called if @obj if not itself an instance of the
+	 * appropriate class but has one in its prototype chain.  Fail
+	 * such calls.  */
+	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	vs = interpreter->vs;
+	if (!vs) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
+
+	if (!ns) {
+		args.rval().setInt32(0);
+		return true;
+	}
+
+	args.rval().setInt32(ns->size());
+
+	return true;
+}
+
+static bool
+htmlCollection_item(JSContext *ctx, unsigned int argc, JS::Value *vp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JS::Value val;
+	JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+	JS::RootedObject hobj(ctx, &args.thisv().toObject());
+	JS::RootedValue rval(ctx, val);
+
+	int index = args[0].toInt32();
+	bool ret = htmlCollection_item2(ctx, hobj, index, &rval);
+	args.rval().set(rval);
+
+	return ret;
+}
+
+static bool
+htmlCollection_namedItem(JSContext *ctx, unsigned int argc, JS::Value *vp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JS::Value val;
+	JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+	JS::RootedObject hobj(ctx, &args.thisv().toObject());
+	JS::RootedValue rval(ctx, val);
+
+	char *str = jsval_to_string(ctx, args[0]);
+	rval.setNull();
+	bool ret = htmlCollection_namedItem2(ctx, hobj, str, &rval);
+	args.rval().set(rval);
+
+	mem_free_if(str);
+
+	return ret;
+}
+
+static bool
+htmlCollection_item2(JSContext *ctx, JS::HandleObject hobj, int index, JS::MutableHandleValue hvp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JS::Realm *comp = js::GetContextRealm(ctx);
+
+	if (!comp) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
+
+	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	hvp.setUndefined();
+
+	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
+
+	if (!ns) {
+		return true;
+	}
+
+	xmlpp::Element *element;
+
+	try {
+		element = ns->at(index);
+	} catch (std::out_of_range e) { return true;}
+
+	if (!element) {
+		return true;
+	}
+
+	JSObject *obj = getElement(ctx, element);
+	hvp.setObject(*obj);
+
+	return true;
+}
+
+static bool
+htmlCollection_namedItem2(JSContext *ctx, JS::HandleObject hobj, char *str, JS::MutableHandleValue hvp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JS::Realm *comp = js::GetContextRealm(ctx);
+
+	if (!comp) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
+
+	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
+
+	if (!ns) {
+		return true;
+	}
+
+	xmlpp::ustring name = str;
+
+	auto it = ns->begin();
+	auto end = ns->end();
+
+	for (; it != end; ++it) {
+		const auto element = dynamic_cast<const xmlpp::Element*>(*it);
+
+		if (!element) {
+			continue;
+		}
+
+		if (name == element->get_attribute_value("id")
+		|| name == element->get_attribute_value("name")) {
+			JSObject *obj = getElement(ctx, element);
+			hvp.setObject(*obj);
+			return true;
+		}
+	}
+
+	return true;
+}
+
+static bool
+htmlCollection_set_items(JSContext *ctx, JS::HandleObject hobj, void *node)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+
+	JS::Realm *comp = js::GetContextRealm(ctx);
+
+	if (!comp) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
+
+	/* This can be called if @obj if not itself an instance of the
+	 * appropriate class but has one in its prototype chain.  Fail
+	 * such calls.  */
+	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+	int counter = 0;
+
+	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
+
+	if (!ns) {
+		return true;
+	}
+
+	xmlpp::Element *element;
+
+	while (1) {
+		try {
+			element = ns->at(counter);
+		} catch (std::out_of_range e) { return true;}
+
+		if (!element) {
+			return true;
+		}
+
+		JSObject *obj = getElement(ctx, element);
+
+		if (!obj) {
+			continue;
+		}
+		JS::RootedObject v(ctx, obj);
+		JS::RootedValue ro(ctx, JS::ObjectOrNullValue(v));
+		JS_SetElement(ctx, hobj, counter, ro);
+
+		xmlpp::ustring name = element->get_attribute_value("id");
+		if (name == "") {
+			name = element->get_attribute_value("name");
+		}
+		if (name != "" && name != "item" && name != "namedItem") {
+			JS_DefineProperty(ctx, hobj, name.c_str(), ro, JSPROP_ENUMERATE);
+		}
+		counter++;
+	}
+
+	return true;
+}
+
+static bool
+htmlCollection_get_property(JSContext *ctx, JS::HandleObject hobj, JS::HandleId hid, JS::MutableHandleValue hvp)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	jsid id = hid.get();
+	struct view_state *vs;
+	JS::Value idval;
+
+	JS::Realm *comp = js::GetContextRealm(ctx);
+
+	if (!comp) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
+
+	/* This can be called if @obj if not itself an instance of the
+	 * appropriate class but has one in its prototype chain.  Fail
+	 * such calls.  */
+	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
+#endif
+		return false;
+	}
+
+	if (JSID_IS_INT(id)) {
+		JS::RootedValue r_idval(ctx, idval);
+		JS_IdToValue(ctx, id, &r_idval);
+		int index = r_idval.toInt32();
+		return htmlCollection_item2(ctx, hobj, index, hvp);
+	}
+
+	if (JSID_IS_STRING(id)) {
+		JS::RootedValue r_idval(ctx, idval);
+		JS_IdToValue(ctx, id, &r_idval);
+		char *string = jsval_to_string(ctx, r_idval);
+
+		if (string) {
+			xmlpp::ustring test = string;
+
+			if (test != "item" && test != "namedItem") {
+				bool ret = htmlCollection_namedItem2(ctx, hobj, string, hvp);
+				mem_free(string);
+				return ret;
+			}
+			mem_free(string);
+		}
+	}
+
+	return true;
+}
+
+JSObject *
+getCollection(JSContext *ctx, void *node)
+{
+#ifdef ECMASCRIPT_DEBUG
+	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
+#endif
+	JSObject *el = JS_NewObject(ctx, &htmlCollection_class);
+
+	if (!el) {
+		return NULL;
+	}
+
+	JS::RootedObject r_el(ctx, el);
+
+	JS_DefineProperties(ctx, r_el, (JSPropertySpec *) htmlCollection_props);
+	spidermonkey_DefineFunctions(ctx, el, htmlCollection_funcs);
+
+	JS_SetPrivate(el, node);
+	htmlCollection_set_items(ctx, r_el, node);
+
+	return el;
+}

src/ecmascript/spidermonkey/collection.h

@@ -0,0 +1,8 @@
+#ifndef EL__ECMASCRIPT_SPIDERMONKEY_COLLECTION_H
+#define EL__ECMASCRIPT_SPIDERMONKEY_COLLECTION_H
+
+#include "ecmascript/spidermonkey/util.h"
+
+JSObject *getCollection(JSContext *ctx, void *node);
+
+#endif

src/ecmascript/spidermonkey/document.c

@@ -24,6 +24,7 @@
 #include "document/forms.h"
 #include "document/view.h"
 #include "ecmascript/ecmascript.h"
+#include "ecmascript/spidermonkey/collection.h"
 #include "ecmascript/spidermonkey/css2xpath.h"
 #include "ecmascript/spidermonkey/form.h"
 #include "ecmascript/spidermonkey/implementation.h"

src/ecmascript/spidermonkey/element.c

@@ -25,6 +25,7 @@
 #include "ecmascript/ecmascript.h"
 #include "ecmascript/spidermonkey/attr.h"
 #include "ecmascript/spidermonkey/attributes.h"
+#include "ecmascript/spidermonkey/collection.h"
 #include "ecmascript/spidermonkey/css2xpath.h"
 #include "ecmascript/spidermonkey/element.h"
 #include "ecmascript/spidermonkey/nodelist.h"
@@ -59,9 +60,6 @@
 #include <algorithm>
 #include <string>
 
-static bool htmlCollection_set_items(JSContext *ctx, JS::HandleObject hobj, void *node);
-static bool nodeList_set_items(JSContext *ctx, JS::HandleObject hobj, void *node);
-
 static bool element_get_property_attributes(JSContext *ctx, unsigned int argc, JS::Value *vp);
 static bool element_get_property_children(JSContext *ctx, unsigned int argc, JS::Value *vp);
 static bool element_get_property_childElementCount(JSContext *ctx, unsigned int argc, JS::Value *vp);
@@ -3184,390 +3182,3 @@ getElement(JSContext *ctx, void *node)
 
 	return el;
 }
-
-static bool htmlCollection_item(JSContext *ctx, unsigned int argc, JS::Value *rval);
-static bool htmlCollection_namedItem(JSContext *ctx, unsigned int argc, JS::Value *rval);
-static bool htmlCollection_get_property(JSContext *ctx, JS::HandleObject hobj, JS::HandleId hid, JS::MutableHandleValue hvp);
-static bool htmlCollection_item2(JSContext *ctx, JS::HandleObject hobj, int index, JS::MutableHandleValue hvp);
-static bool htmlCollection_namedItem2(JSContext *ctx, JS::HandleObject hobj, char *str, JS::MutableHandleValue hvp);
-
-static void htmlCollection_finalize(JSFreeOp *op, JSObject *obj)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-}
-
-
-JSClassOps htmlCollection_ops = {
-	nullptr,  // addProperty
-	nullptr,  // deleteProperty
-	nullptr,  // enumerate
-	nullptr,  // newEnumerate
-	nullptr,  // resolve
-	nullptr,  // mayResolve
-	htmlCollection_finalize, // finalize
-	nullptr,  // call
-	nullptr,  // hasInstance
-	nullptr,  // construct
-	JS_GlobalObjectTraceHook
-};
-
-JSClass htmlCollection_class = {
-	"htmlCollection",
-	JSCLASS_HAS_PRIVATE,
-	&htmlCollection_ops
-};
-
-static const spidermonkeyFunctionSpec htmlCollection_funcs[] = {
-	{ "item",		htmlCollection_item,		1 },
-	{ "namedItem",		htmlCollection_namedItem,	1 },
-	{ NULL }
-};
-
-static bool htmlCollection_get_property_length(JSContext *ctx, unsigned int argc, JS::Value *vp);
-
-static JSPropertySpec htmlCollection_props[] = {
-	JS_PSG("length",	htmlCollection_get_property_length, JSPROP_ENUMERATE),
-	JS_PS_END
-};
-
-static bool
-htmlCollection_get_property_length(JSContext *ctx, unsigned int argc, JS::Value *vp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JS::CallArgs args = CallArgsFromVp(argc, vp);
-	JS::RootedObject hobj(ctx, &args.thisv().toObject());
-
-	struct view_state *vs;
-	JS::Realm *comp = js::GetContextRealm(ctx);
-
-	if (!comp) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
-
-	/* This can be called if @obj if not itself an instance of the
-	 * appropriate class but has one in its prototype chain.  Fail
-	 * such calls.  */
-	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	vs = interpreter->vs;
-	if (!vs) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
-
-	if (!ns) {
-		args.rval().setInt32(0);
-		return true;
-	}
-
-	args.rval().setInt32(ns->size());
-
-	return true;
-}
-
-static bool
-htmlCollection_item(JSContext *ctx, unsigned int argc, JS::Value *vp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JS::Value val;
-	JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-	JS::RootedObject hobj(ctx, &args.thisv().toObject());
-	JS::RootedValue rval(ctx, val);
-
-	int index = args[0].toInt32();
-	bool ret = htmlCollection_item2(ctx, hobj, index, &rval);
-	args.rval().set(rval);
-
-	return ret;
-}
-
-static bool
-htmlCollection_namedItem(JSContext *ctx, unsigned int argc, JS::Value *vp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JS::Value val;
-	JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-	JS::RootedObject hobj(ctx, &args.thisv().toObject());
-	JS::RootedValue rval(ctx, val);
-
-	char *str = jsval_to_string(ctx, args[0]);
-	rval.setNull();
-	bool ret = htmlCollection_namedItem2(ctx, hobj, str, &rval);
-	args.rval().set(rval);
-
-	mem_free_if(str);
-
-	return ret;
-}
-
-static bool
-htmlCollection_item2(JSContext *ctx, JS::HandleObject hobj, int index, JS::MutableHandleValue hvp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JS::Realm *comp = js::GetContextRealm(ctx);
-
-	if (!comp) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
-
-	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	hvp.setUndefined();
-
-	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
-
-	if (!ns) {
-		return true;
-	}
-
-	xmlpp::Element *element;
-
-	try {
-		element = ns->at(index);
-	} catch (std::out_of_range e) { return true;}
-
-	if (!element) {
-		return true;
-	}
-
-	JSObject *obj = getElement(ctx, element);
-	hvp.setObject(*obj);
-
-	return true;
-}
-
-static bool
-htmlCollection_namedItem2(JSContext *ctx, JS::HandleObject hobj, char *str, JS::MutableHandleValue hvp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JS::Realm *comp = js::GetContextRealm(ctx);
-
-	if (!comp) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
-
-	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
-
-	if (!ns) {
-		return true;
-	}
-
-	xmlpp::ustring name = str;
-
-	auto it = ns->begin();
-	auto end = ns->end();
-
-	for (; it != end; ++it) {
-		const auto element = dynamic_cast<const xmlpp::Element*>(*it);
-
-		if (!element) {
-			continue;
-		}
-
-		if (name == element->get_attribute_value("id")
-		|| name == element->get_attribute_value("name")) {
-			JSObject *obj = getElement(ctx, element);
-			hvp.setObject(*obj);
-			return true;
-		}
-	}
-
-	return true;
-}
-
-static bool
-htmlCollection_set_items(JSContext *ctx, JS::HandleObject hobj, void *node)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-
-	JS::Realm *comp = js::GetContextRealm(ctx);
-
-	if (!comp) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
-
-	/* This can be called if @obj if not itself an instance of the
-	 * appropriate class but has one in its prototype chain.  Fail
-	 * such calls.  */
-	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-	int counter = 0;
-
-	xmlpp::Node::NodeSet *ns = JS_GetPrivate(hobj);
-
-	if (!ns) {
-		return true;
-	}
-
-	xmlpp::Element *element;
-
-	while (1) {
-		try {
-			element = ns->at(counter);
-		} catch (std::out_of_range e) { return true;}
-
-		if (!element) {
-			return true;
-		}
-
-		JSObject *obj = getElement(ctx, element);
-
-		if (!obj) {
-			continue;
-		}
-		JS::RootedObject v(ctx, obj);
-		JS::RootedValue ro(ctx, JS::ObjectOrNullValue(v));
-		JS_SetElement(ctx, hobj, counter, ro);
-
-		xmlpp::ustring name = element->get_attribute_value("id");
-		if (name == "") {
-			name = element->get_attribute_value("name");
-		}
-		if (name != "" && name != "item" && name != "namedItem") {
-			JS_DefineProperty(ctx, hobj, name.c_str(), ro, JSPROP_ENUMERATE);
-		}
-		counter++;
-	}
-
-	return true;
-}
-
-static bool
-htmlCollection_get_property(JSContext *ctx, JS::HandleObject hobj, JS::HandleId hid, JS::MutableHandleValue hvp)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	jsid id = hid.get();
-	struct view_state *vs;
-	JS::Value idval;
-
-	JS::Realm *comp = js::GetContextRealm(ctx);
-
-	if (!comp) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	struct ecmascript_interpreter *interpreter = JS::GetRealmPrivate(comp);
-
-	/* This can be called if @obj if not itself an instance of the
-	 * appropriate class but has one in its prototype chain.  Fail
-	 * such calls.  */
-	if (!JS_InstanceOf(ctx, hobj, &htmlCollection_class, NULL)) {
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s %d\n", __FILE__, __FUNCTION__, __LINE__);
-#endif
-		return false;
-	}
-
-	if (JSID_IS_INT(id)) {
-		JS::RootedValue r_idval(ctx, idval);
-		JS_IdToValue(ctx, id, &r_idval);
-		int index = r_idval.toInt32();
-		return htmlCollection_item2(ctx, hobj, index, hvp);
-	}
-
-	if (JSID_IS_STRING(id)) {
-		JS::RootedValue r_idval(ctx, idval);
-		JS_IdToValue(ctx, id, &r_idval);
-		char *string = jsval_to_string(ctx, r_idval);
-
-		if (string) {
-			xmlpp::ustring test = string;
-
-			if (test != "item" && test != "namedItem") {
-				bool ret = htmlCollection_namedItem2(ctx, hobj, string, hvp);
-				mem_free(string);
-				return ret;
-			}
-			mem_free(string);
-		}
-	}
-
-	return true;
-}
-
-JSObject *
-getCollection(JSContext *ctx, void *node)
-{
-#ifdef ECMASCRIPT_DEBUG
-	fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
-#endif
-	JSObject *el = JS_NewObject(ctx, &htmlCollection_class);
-
-	if (!el) {
-		return NULL;
-	}
-
-	JS::RootedObject r_el(ctx, el);
-
-	JS_DefineProperties(ctx, r_el, (JSPropertySpec *) htmlCollection_props);
-	spidermonkey_DefineFunctions(ctx, el, htmlCollection_funcs);
-
-	JS_SetPrivate(el, node);
-	htmlCollection_set_items(ctx, r_el, node);
-
-	return el;
-}

src/ecmascript/spidermonkey/element.h

@@ -8,7 +8,6 @@ extern JSClass element_class;
 extern JSPropertySpec element_props[];
 
 JSObject *getElement(JSContext *ctx, void *node);
-JSObject *getCollection(JSContext *ctx, void *node);
 
 void walk_tree(struct string *buf, void *nod, bool start = true, bool toSortAttrs = false);
 

src/ecmascript/spidermonkey/meson.build

@@ -1,3 +1,3 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-srcs += files('attr.c', 'attributes.c', 'console.c', 'css2xpath.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')
+srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'css2xpath.c', 'document.c', 'element.c', 'form.c', 'heartbeat.c', 'implementation.c', 'location.c', 'localstorage.c', 'localstorage-db.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')