From 83f3338663c4969eebefd8c2c43bd3fc43587fdd Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 21 Dec 2011 22:18:10 +0000
Subject: Merge branches/jmb/dom-alloc-purge back to trunk

svn path=/trunk/libdom/; revision=13316
---
 src/html/html_style_element.c | 47 ++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

(limited to 'src/html/html_style_element.c')

diff --git a/src/html/html_style_element.c b/src/html/html_style_element.c
index b39995a..e4cb6f2 100644
--- a/src/html/html_style_element.c
+++ b/src/html/html_style_element.c
@@ -5,6 +5,8 @@
  * Copyright 2009 Bo Yang <struggleyb.nku.com>
  */
 
+#include <stdlib.h>
+
 #include "html/html_style_element.h"
 
 #include "core/node.h"
@@ -28,7 +30,7 @@ static struct dom_element_protected_vtable _protect_vtable = {
 dom_exception _dom_html_style_element_create(struct dom_document *doc,
 		struct dom_html_style_element **ele)
 {
-	*ele = _dom_document_alloc(doc, NULL, sizeof(dom_html_style_element));
+	*ele = malloc(sizeof(dom_html_style_element));
 	if (*ele == NULL)
 		return DOM_NO_MEM_ERR;
 	
@@ -50,17 +52,16 @@ dom_exception _dom_html_style_element_create(struct dom_document *doc,
 dom_exception _dom_html_style_element_initialise(struct dom_document *doc,
 		struct dom_html_style_element *ele)
 {
-	const char *str = "STYLE";
-	lwc_string *name = NULL;
+	dom_string *name = NULL;
 	dom_exception err;
 
-	err = _dom_document_create_lwcstring(doc, (const uint8_t *) str, SLEN(str),
+	err = dom_string_create((const uint8_t *) "STYLE", SLEN("STYLE"),
 			&name);
 	if (err != DOM_NO_ERR)
 		return err;
 	
 	err = _dom_html_element_initialise(doc, &ele->base, name, NULL, NULL);
-	_dom_document_unref_lwcstring(doc, name);
+	dom_string_unref(name);
 
 	return err;
 }
@@ -68,26 +69,22 @@ dom_exception _dom_html_style_element_initialise(struct dom_document *doc,
 /**
  * Finalise a dom_html_style_element object
  *
- * \param doc  The document object
  * \param ele  The dom_html_style_element object
  */
-void _dom_html_style_element_finalise(struct dom_document *doc,
-		struct dom_html_style_element *ele)
+void _dom_html_style_element_finalise(struct dom_html_style_element *ele)
 {
-	_dom_html_element_finalise(doc, &ele->base);
+	_dom_html_element_finalise(&ele->base);
 }
 
 /**
  * Destroy a dom_html_style_element object
  *
- * \param doc  The document object
  * \param ele  The dom_html_style_element object
  */
-void _dom_html_style_element_destroy(struct dom_document *doc,
-		struct dom_html_style_element *ele)
+void _dom_html_style_element_destroy(struct dom_html_style_element *ele)
 {
-	_dom_html_style_element_finalise(doc, ele);
-	_dom_document_alloc(doc, ele, 0);
+	_dom_html_style_element_finalise(ele);
+	free(ele);
 }
 
 /*------------------------------------------------------------------------*/
@@ -111,28 +108,14 @@ dom_exception _dom_html_style_element_parse_attribute(dom_element *ele,
 /* The virtual destroy function, see src/core/node.c for detail */
 void _dom_virtual_html_style_element_destroy(dom_node_internal *node)
 {
-	struct dom_document *doc = dom_node_get_owner(node);
-	_dom_html_style_element_destroy(doc, (struct dom_html_style_element *) node);
-}
-
-/* The virtual allocation function, see src/core/node.c for detail */
-dom_exception _dom_html_style_element_alloc(struct dom_document *doc,
-		struct dom_node_internal *n, struct dom_node_internal **ret)
-{
-	UNUSED(n);
-
-	*ret = _dom_document_alloc(doc, NULL, sizeof(dom_html_style_element));
-	if (*ret == NULL)
-		return DOM_NO_MEM_ERR;
-	
-	return DOM_NO_ERR;
+	_dom_html_style_element_destroy((struct dom_html_style_element *) node);
 }
 
 /* The virtual copy function, see src/core/node.c for detail */
-dom_exception _dom_html_style_element_copy(struct dom_node_internal *new,
-		struct dom_node_internal *old)
+dom_exception _dom_html_style_element_copy(dom_node_internal *old,
+		dom_node_internal **copy)
 {
-	return _dom_html_element_copy(new, old);
+	return _dom_html_element_copy(old, copy);
 }
 
 /*-----------------------------------------------------------------------*/
-- 
cgit v1.2.3