1 files changed, 62 insertions, 36 deletions

diff --git a/src/core/entity_ref.c b/src/core/entity_ref.c
index 2b90c79..c5b426c 100644
--- a/src/core/entity_ref.c
+++ b/src/core/entity_ref.c
@@ -3,8 +3,11 @@
  * Licensed under the MIT License,
  *                http://www.opensource.org/licenses/mit-license.php
  * Copyright 2007 John-Mark Bell <jmb@netsurf-browser.org>
+ * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com>
  */
 
+#include <libwapcaplet/libwapcaplet.h>
+
 #include "core/document.h"
 #include "core/entity_ref.h"
 #include "core/node.h"
@@ -17,6 +20,14 @@ struct dom_entity_reference {
 	struct dom_node_internal base;		/**< Base node */
 };
 
+static struct dom_node_vtable er_vtable = {
+	DOM_NODE_VTABLE
+};
+
+static struct dom_node_protect_vtable er_protect_vtable = {
+	DOM_ER_PROTECT_VTABLE
+};
+
 /**
  * Create an entity reference
  *
@@ -31,24 +42,27 @@ struct dom_entity_reference {
  *
  * The returned node will already be referenced.
  */
-dom_exception dom_entity_reference_create(struct dom_document *doc,
-		struct dom_string *name, struct dom_string *value,
+dom_exception _dom_entity_reference_create(struct dom_document *doc,
+		struct lwc_string_s *name, struct dom_string *value,
 		struct dom_entity_reference **result)
 {
 	struct dom_entity_reference *e;
 	dom_exception err;
 
 	/* Allocate the comment node */
-	e = dom_document_alloc(doc, NULL,
+	e = _dom_document_alloc(doc, NULL,
 			sizeof(struct dom_entity_reference));
 	if (e == NULL)
 		return DOM_NO_MEM_ERR;
 
+	e->base.base.vtable = &er_vtable;
+	e->base.vtable = &er_protect_vtable;
+
 	/* And initialise the node */
-	err = dom_node_initialise(&e->base, doc, DOM_ENTITY_REFERENCE_NODE,
-			name, value, NULL, NULL);
+	err = _dom_entity_reference_initialise(&e->base, doc, 
+			DOM_ENTITY_REFERENCE_NODE, name, value, NULL, NULL);
 	if (err != DOM_NO_ERR) {
-		dom_document_alloc(doc, e, 0);
+		_dom_document_alloc(doc, e, 0);
 		return err;
 	}
 
@@ -65,52 +79,28 @@ dom_exception dom_entity_reference_create(struct dom_document *doc,
  *
  * The contents of ::entity will be destroyed and ::entity will be freed.
  */
-void dom_entity_reference_destroy(struct dom_document *doc,
+void _dom_entity_reference_destroy(struct dom_document *doc,
 		struct dom_entity_reference *entity)
 {
-	struct dom_node_internal *c, *d;
-
-	/* Destroy children of this node */
-	for (c = entity->base.first_child; c != NULL; c = d) {
-		d = c->next;
-
-		/* Detach child */
-		c->parent = NULL;
-
-		if (c->refcnt > 0) {
-			/* Something is using this child */
-
-			/** \todo add to list of nodes pending deletion */
-
-			continue;
-		}
-
-		/* Detach from sibling list */
-		c->previous = NULL;
-		c->next = NULL;
-
-		dom_node_destroy(c);
-	}
-
 	/* Finalise base class */
-	dom_node_finalise(doc, &entity->base);
+	_dom_entity_reference_finalise(doc, &entity->base);
 
 	/* Destroy fragment */
-	dom_document_alloc(doc, entity, 0);
+	_dom_document_alloc(doc, entity, 0);
 }
 
 /**
- * Get the textual representation of an EntityReference
+ * Get the textual representation of an EntityRererence
  *
  * \param entity  The entity reference to get the textual representation of
  * \param result  Pointer to location to receive result
  * \return DOM_NO_ERR on success.
  *
  * The returned string will have its reference count increased. It is
- * the responsibility of the caller to unref the string once it has
+ * the responsibility of the caller to unrer the string once it has
  * finished with it.
  */
-dom_exception dom_entity_reference_get_textual_representation(
+dom_exception _dom_entity_reference_get_textual_representation(
 		struct dom_entity_reference *entity, struct dom_string **result)
 {
 	UNUSED(entity);
@@ -119,3 +109,39 @@ dom_exception dom_entity_reference_get_textual_representation(
 	return DOM_NOT_SUPPORTED_ERR;
 }
 
+/*-----------------------------------------------------------------------*/
+
+/* Following comes the protected vtable  */
+
+/* The virtual destroy function of this class */
+void _dom_er_destroy(struct dom_node_internal *node)
+{
+	_dom_entity_reference_destroy(node->owner, 
+			(struct dom_entity_reference *) node);
+}
+
+/* The memory allocator of this class */
+dom_exception _dom_er_alloc(struct dom_document *doc,
+		struct dom_node_internal *n, struct dom_node_internal **ret)
+{
+	UNUSED(n);
+	dom_entity_reference *a;
+	
+	a = _dom_document_alloc(doc, NULL, sizeof(struct dom_entity_reference));
+	if (a == NULL)
+		return DOM_NO_MEM_ERR;
+	
+	*ret = (dom_node_internal *) a;
+	dom_node_set_owner(*ret, doc);
+
+	return DOM_NO_ERR;
+	
+}
+
+/* The copy constructor of this class */
+dom_exception _dom_er_copy(struct dom_node_internal *new, 
+		struct dom_node_internal *old)
+{
+	return _dom_node_copy(new, old);
+}
+