From c6274851b2350b335764751e611f08586b070a99 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Tue, 12 Jun 2007 14:37:31 +0200
Subject: [PATCH] DOM, ecmascript: Argument of done functions changed to struct
 dom_node *.

node is needed by some unregister functions.
---
 .../dom/ecmascript/spidermonkey/html/HTMLAnchorElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLAnchorElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLAppletElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLAppletElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLAreaElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLAreaElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLBRElement.c        | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLBRElement.h        | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLBaseElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLBaseElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLBodyElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLBodyElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLButtonElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLButtonElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLDListElement.c     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLDListElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.c | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.h | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLDivElement.c       | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLDivElement.h       | 2 +-
 src/document/dom/ecmascript/spidermonkey/html/HTMLElement.c | 4 ++--
 src/document/dom/ecmascript/spidermonkey/html/HTMLElement.h | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.c  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFontElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLFontElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFormElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLFormElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFrameElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLFrameElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLHRElement.c        | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLHRElement.h        | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLHeadElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLHeadElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLHeadingElement.c   | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLHeadingElement.h   | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLHtmlElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLHtmlElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLIFrameElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLIFrameElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLImageElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLImageElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLInputElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLInputElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.c   | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.h   | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLLIElement.c        | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLLIElement.h        | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLLabelElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLLabelElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLLegendElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLLegendElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLLinkElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLLinkElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLMapElement.c       | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLMapElement.h       | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLMenuElement.c      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLMenuElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLMetaElement.c      | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLMetaElement.h      | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLModElement.c       | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLModElement.h       | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLOListElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLOListElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLObjectElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLObjectElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLOptionElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLOptionElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLParagraphElement.c | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLParagraphElement.h | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLParamElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLParamElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLPreElement.c       | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLPreElement.h       | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLQuoteElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLQuoteElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLScriptElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLScriptElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLSelectElement.c    | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLSelectElement.h    | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLStyleElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLStyleElement.h     | 2 +-
 .../ecmascript/spidermonkey/html/HTMLTableCaptionElement.c  | 4 ++--
 .../ecmascript/spidermonkey/html/HTMLTableCaptionElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTableCellElement.c | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTableCellElement.h | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTableColElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTableColElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTableElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTableElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTableRowElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTableRowElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.c  | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.h  | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLTitleElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLTitleElement.h     | 2 +-
 .../dom/ecmascript/spidermonkey/html/HTMLUListElement.c     | 4 ++--
 .../dom/ecmascript/spidermonkey/html/HTMLUListElement.h     | 2 +-
 src/document/dom/ecmascript/spidermonkey/html/html.c        | 6 +++---
 105 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.c
index ca6030b6..d72a94bc 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.c
@@ -191,9 +191,9 @@ make_A_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_A_object(void *data)
+done_A_object(struct dom_node *node)
 {
-	struct A_struct *d = data;
+	struct A_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->access_key);
 	mem_free_if(d->charset);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.h
index ffdd6351..82f53db7 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAnchorElement.h
@@ -25,6 +25,6 @@ struct A_struct {
 };
 
 void make_A_object(JSContext *ctx, struct dom_node *node);
-void done_A_object(void *data);
+void done_A_object(struct dom_node *node);
 
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.c
index ab1b5d9c..865380bd 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.c
@@ -164,9 +164,9 @@ make_APPLET_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_APPLET_object(void *data)
+done_APPLET_object(struct dom_node *node)
 {
-	struct APPLET_struct *d = data;
+	struct APPLET_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 	mem_free_if(d->alt);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.h
index 2d47096c..578dad85 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAppletElement.h
@@ -24,5 +24,5 @@ struct APPLET_struct {
 };
 
 void make_APPLET_object(JSContext *ctx, struct dom_node *node);
-void done_APPLET_object(void *data);
+void done_APPLET_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.c
index 412d6dd1..f385f42b 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.c
@@ -144,9 +144,9 @@ make_AREA_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_AREA_object(void *data)
+done_AREA_object(struct dom_node *node)
 {
-	struct AREA_struct *d = data;
+	struct AREA_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->access_key);
 	mem_free_if(d->alt);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.h
index 498e87ca..88877916 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLAreaElement.h
@@ -21,5 +21,5 @@ struct AREA_struct {
 };
 
 void make_AREA_object(JSContext *ctx, struct dom_node *node);
-void done_AREA_object(void *data);
+void done_AREA_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.c
index b479c0f1..af72be66 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.c
@@ -96,9 +96,9 @@ make_BR_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_BR_object(void *data)
+done_BR_object(struct dom_node *node)
 {
-	struct BR_struct *d = data;
+	struct BR_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->clear);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.h
index 02ab6b0f..a0537809 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBRElement.h
@@ -14,5 +14,5 @@ struct BR_struct {
 };
 
 void make_BR_object(JSContext *ctx, struct dom_node *node);
-void done_BR_object(void *data);
+void done_BR_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.c
index ef3ac495..65918146 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.c
@@ -103,9 +103,9 @@ make_BASE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_BASE_object(void *data)
+done_BASE_object(struct dom_node *node)
 {
-	struct BASE_struct *d = data;
+	struct BASE_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->href);
 	mem_free_if(d->target);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.h
index 6556af34..2bce855a 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseElement.h
@@ -15,5 +15,5 @@ struct BASE_struct {
 };
 
 void make_BASE_object(JSContext *ctx, struct dom_node *node);
-void done_BASE_object(void *data);
+void done_BASE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.c
index 7c7d3a64..1bb526d3 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.c
@@ -109,9 +109,9 @@ make_BASEFONT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_BASEFONT_object(void *data)
+done_BASEFONT_object(struct dom_node *node)
 {
-	struct BASEFONT_struct *d = data;
+	struct BASEFONT_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->color);
 	mem_free_if(d->face);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.h
index 8c539442..b0f49ae6 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBaseFontElement.h
@@ -16,5 +16,5 @@ struct BASEFONT_struct {
 };
 
 void make_BASEFONT_object(JSContext *ctx, struct dom_node *node);
-void done_BASEFONT_object(void *data);
+void done_BASEFONT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.c
index 0711ddc5..359d7cc9 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.c
@@ -131,9 +131,9 @@ make_BODY_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_BODY_object(void *data)
+done_BODY_object(struct dom_node *node)
 {
-	struct BODY_struct *d = data;
+	struct BODY_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->alink);
 	mem_free_if(d->background);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.h
index 1ce28ff0..a27d6522 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLBodyElement.h
@@ -19,5 +19,5 @@ struct BODY_struct {
 };
 
 void make_BODY_object(JSContext *ctx, struct dom_node *node);
-void done_BODY_object(void *data);
+void done_BODY_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.c
index e4c6b2fd..bb4b772f 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.c
@@ -134,9 +134,9 @@ make_BUTTON_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_BUTTON_object(void *data)
+done_BUTTON_object(struct dom_node *node)
 {
-	struct BUTTON_struct *d = data;
+	struct BUTTON_struct *d = node->data.element.html_data;
 
 	/* form musn't be freed */
 	mem_free_if(d->access_key);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.h
index ef5f9c6c..53e5c493 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLButtonElement.h
@@ -20,5 +20,5 @@ struct BUTTON_struct {
 };
 
 void make_BUTTON_object(JSContext *ctx, struct dom_node *node);
-void done_BUTTON_object(void *data);
+void done_BUTTON_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.c
index 8ca81033..ef5f9ba0 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.c
@@ -96,6 +96,6 @@ make_DL_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_DL_object(void *data)
+done_DL_object(struct dom_node *node)
 {
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.h
index 3cf4d51c..c811e521 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDListElement.h
@@ -14,5 +14,5 @@ struct DL_struct {
 };
 
 void make_DL_object(JSContext *ctx, struct dom_node *node);
-void done_DL_object(void *data);
+void done_DL_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.c
index 1898ced6..e615a218 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.c
@@ -96,6 +96,6 @@ make_DIR_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_DIR_object(void *data)
+done_DIR_object(struct dom_node *node)
 {
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.h
index ac246461..48e447f4 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDirectoryElement.h
@@ -14,5 +14,5 @@ struct DIR_struct {
 };
 
 void make_DIR_object(JSContext *ctx, struct dom_node *node);
-void done_DIR_object(void *data);
+void done_DIR_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.c
index 3b46d2be..ce205ff1 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.c
@@ -96,9 +96,9 @@ make_DIV_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_DIV_object(void *data)
+done_DIV_object(struct dom_node *node)
 {
-	struct DIV_struct *d = data;
+	struct DIV_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.h
index e885ba34..988d441b 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLDivElement.h
@@ -14,5 +14,5 @@ struct DIV_struct {
 };
 
 void make_DIV_object(JSContext *ctx, struct dom_node *node);
-void done_DIV_object(void *data);
+void done_DIV_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.c
index 55b3e5b8..2714ef12 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.c
@@ -122,9 +122,9 @@ make_HTMLElement(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_HTMLElement(void *data)
+done_HTMLElement(struct dom_node *node)
 {
-	struct HTMLElement_struct *d = data;
+	struct HTMLElement_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->id);
 	mem_free_if(d->title);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.h
index 4d0d8e6b..a428fd14 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLElement.h
@@ -24,7 +24,7 @@ struct html_objects { /* FIXME: Better name for this type. */
 };
 
 void make_HTMLElement(JSContext *ctx, struct dom_node *node);
-void done_HTMLElement(void *data);
+void done_HTMLElement(struct dom_node *node);
 
 #define make_ABBR_object make_HTMLElement
 #define make_ACRONYM_object make_HTMLElement
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.c
index b44b4781..7f37ad19 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.c
@@ -71,6 +71,6 @@ make_FIELDSET_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_FIELDSET_object(void *data)
+done_FIELDSET_object(struct dom_node *node)
 {
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.h
index cfbc0491..7c06afdd 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFieldSetElement.h
@@ -13,6 +13,6 @@ struct FIELDSET_struct {
 };
 
 void make_FIELDSET_object(JSContext *ctx, struct dom_node *node);
-void done_FIELDSET_object(void *data);
+void done_FIELDSET_object(struct dom_node *node);
 
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.c
index 375d195c..9c2d5c6c 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.c
@@ -110,9 +110,9 @@ make_FONT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_FONT_object(void *data)
+done_FONT_object(struct dom_node *node)
 {
-	struct FONT_struct *d = data;
+	struct FONT_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->color);
 	mem_free_if(d->face);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.h
index 5087185a..892ed779 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFontElement.h
@@ -16,5 +16,5 @@ struct FONT_struct {
 };
 
 void make_FONT_object(JSContext *ctx, struct dom_node *node);
-void done_FONT_object(void *data);
+void done_FONT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.c
index 81962f15..83061abb 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.c
@@ -242,9 +242,9 @@ done_elements(struct dom_node_list *list)
 }
 
 void
-done_FORM_object(void *data)
+done_FORM_object(struct dom_node *node)
 {
-	struct FORM_struct *d = data;
+	struct FORM_struct *d = node->data.element.html_data;
 
 	if (d->elements)
 		done_elements(d->elements);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.h
index b7594200..28cddba9 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFormElement.h
@@ -21,7 +21,7 @@ struct FORM_struct {
 };
 
 void make_FORM_object(JSContext *ctx, struct dom_node *node);
-void done_FORM_object(void *data);
+void done_FORM_object(struct dom_node *node);
 void register_form_element(struct dom_node *form, struct dom_node *node);
 void unregister_form_element(struct dom_node *form, struct dom_node *node);
 struct dom_node *find_parent_form(struct dom_node *node);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.c
index 99fc11e2..a88fc001 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.c
@@ -150,9 +150,9 @@ make_FRAME_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_FRAME_object(void *data)
+done_FRAME_object(struct dom_node *node)
 {
-	struct FRAME_struct *d = data;
+	struct FRAME_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->frame_border);
 	mem_free_if(d->long_desc);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.h
index 28c8c42f..b6cbc747 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameElement.h
@@ -22,5 +22,5 @@ struct FRAME_struct {
 };
 
 void make_FRAME_object(JSContext *ctx, struct dom_node *node);
-void done_FRAME_object(void *data);
+void done_FRAME_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.c
index 780ee2ca..dd4b38f5 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.c
@@ -103,9 +103,9 @@ make_FRAMESET_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_FRAMESET_object(void *data)
+done_FRAMESET_object(struct dom_node *node)
 {
-	struct FRAMESET_struct *d = data;
+	struct FRAMESET_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->cols);
 	mem_free_if(d->rows);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.h
index ff1487f4..12a9d2c5 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLFrameSetElement.h
@@ -15,5 +15,5 @@ struct FRAMESET_struct {
 };
 
 void make_FRAMESET_object(JSContext *ctx, struct dom_node *node);
-void done_FRAMESET_object(void *data);
+void done_FRAMESET_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.c
index 3aef5be6..705dbf54 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.c
@@ -117,9 +117,9 @@ make_HR_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_HR_object(void *data)
+done_HR_object(struct dom_node *node)
 {
-	struct HR_struct *d = data;
+	struct HR_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 	mem_free_if(d->size);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.h
index eed5de90..49585cfa 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHRElement.h
@@ -17,5 +17,5 @@ struct HR_struct {
 };
 
 void make_HR_object(JSContext *ctx, struct dom_node *node);
-void done_HR_object(void *data);
+void done_HR_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.c
index 45d601a4..8266e809 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.c
@@ -96,9 +96,9 @@ make_HEAD_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_HEAD_object(void *data)
+done_HEAD_object(struct dom_node *node)
 {
-	struct HEAD_struct *d = data;
+	struct HEAD_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->profile);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.h
index e49f7c9e..7255474a 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadElement.h
@@ -14,5 +14,5 @@ struct HEAD_struct {
 };
 
 void make_HEAD_object(JSContext *ctx, struct dom_node *node);
-void done_HEAD_object(void *data);
+void done_HEAD_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.c
index a9d39726..6c63c3d9 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.c
@@ -96,9 +96,9 @@ make_H1_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_H1_object(void *data)
+done_H1_object(struct dom_node *node)
 {
-	struct H1_struct *d = data;
+	struct H1_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.h
index e90f5123..c58df909 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHeadingElement.h
@@ -14,7 +14,7 @@ struct H1_struct {
 };
 
 void make_H1_object(JSContext *ctx, struct dom_node *node);
-void done_H1_object(void *data);
+void done_H1_object(struct dom_node *node);
 
 #define make_H2_object	make_H1_object
 #define make_H3_object	make_H1_object
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.c
index f73995ea..c48c802d 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.c
@@ -96,9 +96,9 @@ make_HTML_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_HTML_object(void *data)
+done_HTML_object(struct dom_node *node)
 {
-	struct HTML_struct *d = data;
+	struct HTML_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->version);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.h
index e6841344..719abfd6 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLHtmlElement.h
@@ -14,5 +14,5 @@ struct HTML_struct {
 };
 
 void make_HTML_object(JSContext *ctx, struct dom_node *node);
-void done_HTML_object(void *data);
+void done_HTML_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.c
index 05f09a9e..1db82071 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.c
@@ -164,9 +164,9 @@ make_IFRAME_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_IFRAME_object(void *data)
+done_IFRAME_object(struct dom_node *node)
 {
-	struct IFRAME_struct *d = data;
+	struct IFRAME_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 	mem_free_if(d->frame_border);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.h
index c895255b..526b3f97 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLIFrameElement.h
@@ -24,5 +24,5 @@ struct IFRAME_struct {
 };
 
 void make_IFRAME_object(JSContext *ctx, struct dom_node *node);
-void done_IFRAME_object(void *data);
+void done_IFRAME_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.c
index 8ac8ec52..2428efd0 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.c
@@ -169,9 +169,9 @@ make_IMG_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_IMG_object(void *data)
+done_IMG_object(struct dom_node *node)
 {
-	struct IMG_struct *d = data;
+	struct IMG_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->name);
 	mem_free_if(d->align);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.h
index 7eff3c7d..a68213dc 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLImageElement.h
@@ -25,5 +25,5 @@ struct IMG_struct {
 };
 
 void make_IMG_object(JSContext *ctx, struct dom_node *node);
-void done_IMG_object(void *data);
+void done_IMG_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.c
index 5ceaf7b8..847c59df 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.c
@@ -248,9 +248,9 @@ make_INPUT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_INPUT_object(void *data)
+done_INPUT_object(struct dom_node *node)
 {
-	struct INPUT_struct *d = data;
+	struct INPUT_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->default_value);
 	/* form ? */
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.h
index a6004419..9201d21b 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLInputElement.h
@@ -31,5 +31,5 @@ struct INPUT_struct {
 };
 
 void make_INPUT_object(JSContext *ctx, struct dom_node *node);
-void done_INPUT_object(void *data);
+void done_INPUT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.c
index ed19b504..0439ecb0 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.c
@@ -103,9 +103,9 @@ make_ISINDEX_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_ISINDEX_object(void *data)
+done_ISINDEX_object(struct dom_node *node)
 {
-	struct ISINDEX_struct *d = data;
+	struct ISINDEX_struct *d = node->data.element.html_data;
 
 	/* form ? */
 	mem_free_if(d->prompt);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.h
index b25591af..cb9d38e6 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLIsIndexElement.h
@@ -15,5 +15,5 @@ struct ISINDEX_struct {
 };
 
 void make_ISINDEX_object(JSContext *ctx, struct dom_node *node);
-void done_ISINDEX_object(void *data);
+void done_ISINDEX_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.c
index a6b49226..4c02cd24 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.c
@@ -102,9 +102,9 @@ make_LI_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_LI_object(void *data)
+done_LI_object(struct dom_node *node)
 {
-	struct LI_struct *d = data;
+	struct LI_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->type);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.h
index bf0afbde..54e9a591 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLIElement.h
@@ -15,5 +15,5 @@ struct LI_struct {
 };
 
 void make_LI_object(JSContext *ctx, struct dom_node *node);
-void done_LI_object(void *data);
+void done_LI_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.c
index 7f8c78e4..83624680 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.c
@@ -110,9 +110,9 @@ make_LABEL_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_LABEL_object(void *data)
+done_LABEL_object(struct dom_node *node)
 {
-	struct LABEL_struct *d = data;
+	struct LABEL_struct *d = node->data.element.html_data;
 
 	/* form ? */
 	mem_free_if(d->access_key);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.h
index fc69473c..a304c309 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLabelElement.h
@@ -16,5 +16,5 @@ struct LABEL_struct {
 };
 
 void make_LABEL_object(JSContext *ctx, struct dom_node *node);
-void done_LABEL_object(void *data);
+void done_LABEL_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.c
index 0f5c0e0a..f3dfce3d 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.c
@@ -110,9 +110,9 @@ make_LEGEND_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_LEGEND_object(void *data)
+done_LEGEND_object(struct dom_node *node)
 {
-	struct LEGEND_struct *d = data;
+	struct LEGEND_struct *d = node->data.element.html_data;
 
 	/* form ? */
 	mem_free_if(d->access_key);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.h
index eca6fd3f..1e123f5f 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLegendElement.h
@@ -16,5 +16,5 @@ struct LEGEND_struct {
 };
 
 void make_LEGEND_object(JSContext *ctx, struct dom_node *node);
-void done_LEGEND_object(void *data);
+void done_LEGEND_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.c
index d21bea2c..5636d7b2 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.c
@@ -152,9 +152,9 @@ make_LINK_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_LINK_object(void *data)
+done_LINK_object(struct dom_node *node)
 {
-	struct LINK_struct *d = data;
+	struct LINK_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->charset);
 	mem_free_if(d->href);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.h
index c965a7ad..8e8de960 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLLinkElement.h
@@ -22,5 +22,5 @@ struct LINK_struct {
 };
 
 void make_LINK_object(JSContext *ctx, struct dom_node *node);
-void done_LINK_object(void *data);
+void done_LINK_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.c
index 50f82189..9a2cf238 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.c
@@ -101,9 +101,9 @@ make_MAP_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_MAP_object(void *data)
+done_MAP_object(struct dom_node *node)
 {
-	struct MAP_struct *d = data;
+	struct MAP_struct *d = node->data.element.html_data;
 
 	/* areas ? */
 	mem_free_if(d->name);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.h
index 623ca5bb..6f0fac96 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMapElement.h
@@ -15,5 +15,5 @@ struct MAP_struct {
 };
 
 void make_MAP_object(JSContext *ctx, struct dom_node *node);
-void done_MAP_object(void *data);
+void done_MAP_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.c
index d1993fec..16958238 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.c
@@ -96,6 +96,6 @@ make_MENU_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_MENU_object(void *data)
+done_MENU_object(struct dom_node *node)
 {
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.h
index f1514eac..58cc2a1e 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMenuElement.h
@@ -14,5 +14,5 @@ struct MENU_struct {
 };
 
 void make_MENU_object(JSContext *ctx, struct dom_node *node);
-void done_MENU_object(void *data);
+void done_MENU_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.c
index 7e24ec8c..71d37e56 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.c
@@ -117,9 +117,9 @@ make_META_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_META_object(void *data)
+done_META_object(struct dom_node *node)
 {
-	struct META_struct *d = data;
+	struct META_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->content);
 	mem_free_if(d->http_equiv);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.h
index 39a8272f..45ccd542 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLMetaElement.h
@@ -17,5 +17,5 @@ struct META_struct {
 };
 
 void make_META_object(JSContext *ctx, struct dom_node *node);
-void done_META_object(void *data);
+void done_META_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.c
index 13cd677f..f637e271 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.c
@@ -103,9 +103,9 @@ make_MOD_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_MOD_object(void *data)
+done_MOD_object(struct dom_node *node)
 {
-	struct MOD_struct *d = data;
+	struct MOD_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->cite);
 	mem_free_if(d->date_time);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.h
index 002a6086..365b8ab9 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLModElement.h
@@ -15,5 +15,5 @@ struct MOD_struct {
 };
 
 void make_MOD_object(JSContext *ctx, struct dom_node *node);
-void done_MOD_object(void *data);
+void done_MOD_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.c
index f78cd6a7..47101ad1 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.c
@@ -109,9 +109,9 @@ make_OL_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_OL_object(void *data)
+done_OL_object(struct dom_node *node)
 {
-	struct OL_struct *d = data;
+	struct OL_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->type);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.h
index d6da934a..cf87188d 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOListElement.h
@@ -16,5 +16,5 @@ struct OL_struct {
 };
 
 void make_OL_object(JSContext *ctx, struct dom_node *node);
-void done_OL_object(void *data);
+void done_OL_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.c
index 523d5862..81d17afa 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.c
@@ -216,9 +216,9 @@ make_OBJECT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_OBJECT_object(void *data)
+done_OBJECT_object(struct dom_node *node)
 {
-	struct OBJECT_struct *d = data;
+	struct OBJECT_struct *d = node->data.element.html_data;
 
 	/* form ? */
 	mem_free_if(d->code);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.h
index ae27d48d..39e99436 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLObjectElement.h
@@ -32,5 +32,5 @@ struct OBJECT_struct {
 };
 
 void make_OBJECT_object(JSContext *ctx, struct dom_node *node);
-void done_OBJECT_object(void *data);
+void done_OBJECT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.c
index 41e37261..ca59b11b 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.c
@@ -103,9 +103,9 @@ make_OPTGROUP_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_OPTGROUP_object(void *data)
+done_OPTGROUP_object(struct dom_node *node)
 {
-	struct OPTGROUP_struct *d = data;
+	struct OPTGROUP_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->label);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.h
index 4030f0af..7d3483e7 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptGroupElement.h
@@ -15,5 +15,5 @@ struct OPTGROUP_struct {
 };
 
 void make_OPTGROUP_object(JSContext *ctx, struct dom_node *node);
-void done_OPTGROUP_object(void *data);
+void done_OPTGROUP_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.c
index f1d630af..a544e66a 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.c
@@ -139,9 +139,9 @@ make_OPTION_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_OPTION_object(void *data)
+done_OPTION_object(struct dom_node *node)
 {
-	struct OPTION_struct *d = data;
+	struct OPTION_struct *d = node->data.element.html_data;
 
 	/* form ? */
 	mem_free_if(d->text);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.h
index d991f397..cfc2fd66 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLOptionElement.h
@@ -21,5 +21,5 @@ struct OPTION_struct {
 };
 
 void make_OPTION_object(JSContext *ctx, struct dom_node *node);
-void done_OPTION_object(void *data);
+void done_OPTION_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.c
index df0ee8d9..ad936948 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.c
@@ -96,9 +96,9 @@ make_P_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_P_object(void *data)
+done_P_object(struct dom_node *node)
 {
-	struct P_struct *d = data;
+	struct P_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.h
index 0171b225..d7a1af4a 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLParagraphElement.h
@@ -14,5 +14,5 @@ struct P_struct {
 };
 
 void make_P_object(JSContext *ctx, struct dom_node *node);
-void done_P_object(void *data);
+void done_P_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.c
index 1b7342f5..32d22074 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.c
@@ -117,9 +117,9 @@ make_PARAM_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_PARAM_object(void *data)
+done_PARAM_object(struct dom_node *node)
 {
-	struct PARAM_struct *d = data;
+	struct PARAM_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->name);
 	mem_free_if(d->type);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.h
index ff29ba9d..a2b70875 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLParamElement.h
@@ -17,5 +17,5 @@ struct PARAM_struct {
 };
 
 void make_PARAM_object(JSContext *ctx, struct dom_node *node);
-void done_PARAM_object(void *data);
+void done_PARAM_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.c
index 94997035..f60b1834 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.c
@@ -95,6 +95,6 @@ make_PRE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_PRE_object(void *data)
+done_PRE_object(struct dom_node *node)
 {
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.h
index f287d3b6..6ca9f9c4 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLPreElement.h
@@ -14,5 +14,5 @@ struct PRE_struct {
 };
 
 void make_PRE_object(JSContext *ctx, struct dom_node *node);
-void done_PRE_object(void *data);
+void done_PRE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.c
index 4623cbf5..fde28208 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.c
@@ -96,9 +96,9 @@ make_QUOTE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_QUOTE_object(void *data)
+done_QUOTE_object(struct dom_node *node)
 {
-	struct QUOTE_struct *d = data;
+	struct QUOTE_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->cite);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.h
index 0083b259..5a1597fb 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLQuoteElement.h
@@ -14,5 +14,5 @@ struct QUOTE_struct {
 };
 
 void make_QUOTE_object(JSContext *ctx, struct dom_node *node);
-void done_QUOTE_object(void *data);
+void done_QUOTE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.c
index 36869e9f..efc61648 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.c
@@ -138,9 +138,9 @@ make_SCRIPT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_SCRIPT_object(void *data)
+done_SCRIPT_object(struct dom_node *node)
 {
-	struct SCRIPT_struct *d = data;
+	struct SCRIPT_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->text);
 	mem_free_if(d->html_for);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.h
index 47eb9978..6236601c 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLScriptElement.h
@@ -20,5 +20,5 @@ struct SCRIPT_struct {
 };
 
 void make_SCRIPT_object(JSContext *ctx, struct dom_node *node);
-void done_SCRIPT_object(void *data);
+void done_SCRIPT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.c
index c76098ae..32cf7e74 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.c
@@ -193,9 +193,9 @@ make_SELECT_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_SELECT_object(void *data)
+done_SELECT_object(struct dom_node *node)
 {
-	struct SELECT_struct *d = data;
+	struct SELECT_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->type);
 	mem_free_if(d->value);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.h
index 771dc4cd..cf381b48 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLSelectElement.h
@@ -24,5 +24,5 @@ struct SELECT_struct {
 };
 
 void make_SELECT_object(JSContext *ctx, struct dom_node *node);
-void done_SELECT_object(void *data);
+void done_SELECT_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.c
index 55b170e3..207988fc 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.c
@@ -110,9 +110,9 @@ make_STYLE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_STYLE_object(void *data)
+done_STYLE_object(struct dom_node *node)
 {
-	struct STYLE_struct *d = data;
+	struct STYLE_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->media);
 	mem_free_if(d->type);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.h
index 86bb4463..8c951370 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLStyleElement.h
@@ -16,5 +16,5 @@ struct STYLE_struct {
 };
 
 void make_STYLE_object(JSContext *ctx, struct dom_node *node);
-void done_STYLE_object(void *data);
+void done_STYLE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.c
index 76dc42a4..655df3d7 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.c
@@ -96,9 +96,9 @@ make_CAPTION_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_CAPTION_object(void *data)
+done_CAPTION_object(struct dom_node *node)
 {
-	struct CAPTION_struct *d = data;
+	struct CAPTION_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.h
index 56152594..38da5993 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCaptionElement.h
@@ -14,5 +14,5 @@ struct CAPTION_struct {
 };
 
 void make_CAPTION_object(JSContext *ctx, struct dom_node *node);
-void done_CAPTION_object(void *data);
+void done_CAPTION_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.c
index e820c0b2..40e06cef 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.c
@@ -189,9 +189,9 @@ make_TD_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_TD_object(void *data)
+done_TD_object(struct dom_node *node)
 {
-	struct TD_struct *d = data;
+	struct TD_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->abbr);
 	mem_free_if(d->align);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.h
index 75e876b8..ede63887 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableCellElement.h
@@ -28,5 +28,5 @@ struct TD_struct {
 };
 
 void make_TD_object(JSContext *ctx, struct dom_node *node);
-void done_TD_object(void *data);
+void done_TD_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.c
index bf0838f2..c76fca6e 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.c
@@ -130,9 +130,9 @@ make_COL_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_COL_object(void *data)
+done_COL_object(struct dom_node *node)
 {
-	struct COL_struct *d = data;
+	struct COL_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->align);
 	mem_free_if(d->ch);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.h
index 84f5a99e..d781596f 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableColElement.h
@@ -19,5 +19,5 @@ struct COL_struct {
 };
 
 void make_COL_object(JSContext *ctx, struct dom_node *node);
-void done_COL_object(void *data);
+void done_COL_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.c
index 0c1f2a88..21cf5882 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.c
@@ -261,9 +261,9 @@ make_TABLE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_TABLE_object(void *data)
+done_TABLE_object(struct dom_node *node)
 {
-	struct TABLE_struct *d = data;
+	struct TABLE_struct *d = node->data.element.html_data;
 
 	/* caption ?
 	 * thead ?
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.h
index ad01609d..0a1bfc17 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableElement.h
@@ -27,5 +27,5 @@ struct TABLE_struct {
 };
 
 void make_TABLE_object(JSContext *ctx, struct dom_node *node);
-void done_TABLE_object(void *data);
+void done_TABLE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.c
index de32f477..00c793d1 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.c
@@ -155,9 +155,9 @@ make_TR_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_TR_object(void *data)
+done_TR_object(struct dom_node *node)
 {
-	struct TR_struct *d = data;
+	struct TR_struct *d = node->data.element.html_data;
 
 	/* d->cells ? */
 	mem_free_if(d->align);
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.h
index fdbe74e0..bf6401c0 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTableRowElement.h
@@ -21,5 +21,5 @@ struct TR_struct {
 };
 
 void make_TR_object(JSContext *ctx, struct dom_node *node);
-void done_TR_object(void *data);
+void done_TR_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.c
index 54bc2826..866611c2 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.c
@@ -187,9 +187,9 @@ make_TEXTAREA_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_TEXTAREA_object(void *data)
+done_TEXTAREA_object(struct dom_node *node)
 {
-	struct TEXTAREA_struct *d = data;
+	struct TEXTAREA_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->default_value);
 	/* What to do with d->form? */
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.h
index bb356c8a..ef779376 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTextAreaElement.h
@@ -24,6 +24,6 @@ struct TEXTAREA_struct {
 };
 
 void make_TEXTAREA_object(JSContext *ctx, struct dom_node *node);
-void done_TEXTAREA_object(void *data);
+void done_TEXTAREA_object(struct dom_node *node);
 
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.c
index 47c84cc7..6363b59a 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.c
@@ -92,9 +92,9 @@ make_TITLE_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_TITLE_object(void *data)
+done_TITLE_object(struct dom_node *node)
 {
-	struct TITLE_struct *d = data;
+	struct TITLE_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->text);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.h
index 57d0e519..9e1c918b 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLTitleElement.h
@@ -14,5 +14,5 @@ struct TITLE_struct {
 };
 
 void make_TITLE_object(JSContext *ctx, struct dom_node *node);
-void done_TITLE_object(void *data);
+void done_TITLE_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.c b/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.c
index 4b444877..fa582b93 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.c
@@ -99,9 +99,9 @@ make_UL_object(JSContext *ctx, struct dom_node *node)
 }
 
 void
-done_UL_object(void *data)
+done_UL_object(struct dom_node *node)
 {
-	struct UL_struct *d = data;
+	struct UL_struct *d = node->data.element.html_data;
 
 	mem_free_if(d->type);
 }
diff --git a/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.h b/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.h
index 24a873b6..b2c4a665 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.h
+++ b/src/document/dom/ecmascript/spidermonkey/html/HTMLUListElement.h
@@ -15,5 +15,5 @@ struct UL_struct {
 };
 
 void make_UL_object(JSContext *ctx, struct dom_node *node);
-void done_UL_object(void *data);
+void done_UL_object(struct dom_node *node);
 #endif
diff --git a/src/document/dom/ecmascript/spidermonkey/html/html.c b/src/document/dom/ecmascript/spidermonkey/html/html.c
index c28723f0..2c18877d 100644
--- a/src/document/dom/ecmascript/spidermonkey/html/html.c
+++ b/src/document/dom/ecmascript/spidermonkey/html/html.c
@@ -66,7 +66,7 @@
 #include "ecmascript/spidermonkey/util.h"
 
 typedef void (make_function_T)(JSContext *ctx, struct dom_node *node);
-typedef void (done_function_T)(void *data);
+typedef void (done_function_T)(struct dom_node *node);
 
 struct HTML_functions {
 	make_function_T *make;
@@ -87,8 +87,8 @@ done_dom_node_html_data(struct dom_node *node)
 	void *data = node->data.element.html_data;
 
 	if (func[type].done)
-		func[type].done(data);
-	done_HTMLElement(data);
+		func[type].done(node);
+	done_HTMLElement(node);
 	mem_free(data);
 }