---
Makefile | 1 +
include/dom/dom.h | 1 +
include/dom/html/html_div_element.h | 16 +++
src/html/Makefile | 5 +-
src/html/TODO | 2 +-
src/html/html_div_element.c | 153 +++++++++++++++++++++
src/html/html_div_element.h | 45 ++++++
src/html/html_document.c | 4 +
...vElement01.xml.notimpl => HTMLDivElement01.xml} | 0
9 files changed, 224 insertions(+), 3 deletions(-)
rename test/testcases/tests/level1/html/{HTMLDivElement01.xml.notimpl =>
HTMLDivElement01.xml} (100%)
diff --git a/Makefile b/Makefile
index 3aac0c3..fa0ad62 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS)
$(I):$(Is)/html_option_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_opt_group_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_options_collection.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_hr_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_div_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/include/dom/dom.h b/include/dom/dom.h
index d34f27f..3a2e763 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -56,6 +56,7 @@
#include <dom/html/html_select_element.h>
#include <dom/html/html_options_collection.h>
#include <dom/html/html_hr_element.h>
+#include <dom/html/html_div_element.h>
/* DOM Events header */
#include <dom/events/events.h>
diff --git a/include/dom/html/html_div_element.h
b/include/dom/html/html_div_element.h
index 2e182d5..47c999e 100644
--- a/include/dom/html/html_div_element.h
+++ b/include/dom/html/html_div_element.h
@@ -3,5 +3,21 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <[email protected]>
+ * Copyright 2014 Achal Aggarwal<[email protected]>
*/
+#ifndef dom_html_div_element_h_
+#define dom_html_div_element_h_
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_div_element dom_html_div_element;
+
+dom_exception dom_html_div_element_get_align(
+ dom_html_div_element *element, dom_string **align);
+
+dom_exception dom_html_div_element_set_align(
+ dom_html_div_element *element, dom_string *align);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 5226b53..dfe65c6 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -6,13 +6,14 @@ DIR_SOURCES := \
html_base_element.c html_isindex_element.c html_style_element.c \
html_body_element.c html_form_element.c html_select_element.c \
html_button_element.c html_input_element.c html_text_area_element.c \
- html_opt_group_element.c html_option_element.c html_hr_element.c
+ html_opt_group_element.c html_option_element.c html_hr_element.c \
+ html_div_element.c
UNINMPLEMENTED_SOURCES := \
html_label_element.c html_fieldset_element.c \
html_legend_element.c html_ulist_element.c html_olist_element.c \
html_dlist_element.c html_directory_element.c html_menu_element.c \
- html_li_element.c html_div_element.c html_paragraph_element.c \
+ html_li_element.c html_paragraph_element.c \
html_heading_element.c html_quote_element.c html_pre_element.c \
html_br_element.c html_basefont_element.c html_font_element.c \
html_mod_element.c html_anchor_element.c \
diff --git a/src/html/TODO b/src/html/TODO
index 37ade2c..f0ec2d5 100644
--- a/src/html/TODO
+++ b/src/html/TODO
@@ -28,7 +28,7 @@ HTMLDirectoryElement html_directory_element MISSING
HTMLMenuElement html_menu_element MISSING
HTMLLIElement html_li_element MISSING
HTMLBlockquoteElement html_blockquote_element MISSING
-HTMLDivElement html_div_element MISSING
+HTMLDivElement html_div_element DONE
HTMLParagraphElement html_paragraph_element MISSING
HTMLHeadingElement html_heading_element MISSING
HTMLQuoteElement html_quote_element MISSING
diff --git a/src/html/html_div_element.c b/src/html/html_div_element.c
index 2e182d5..39ed0fa 100644
--- a/src/html/html_div_element.c
+++ b/src/html/html_div_element.c
@@ -3,5 +3,158 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <[email protected]>
+ * Copyright 2014 Achal Aggarwal<[email protected]>
*/
+#include <assert.h>
+#include <stdlib.h>
+#include <dom/html/html_div_element.h>
+
+#include "html/html_document.h"
+#include "html/html_div_element.h"
+
+#include "core/node.h"
+#include "core/attr.h"
+#include "utils/utils.h"
+
+static struct dom_element_protected_vtable _protect_vtable = {
+ {
+ DOM_NODE_PROTECT_VTABLE_HTML_DIV_ELEMENT
+ },
+ DOM_HTML_DIV_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_div_element object
+ *
+ * \param doc The document object
+ * \param ele The returned element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_div_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_div_element **ele)
+{
+ struct dom_node_internal *node;
+
+ *ele = malloc(sizeof(dom_html_div_element));
+ if (*ele == NULL)
+ return DOM_NO_MEM_ERR;
+
+ /* Set up vtables */
+ node = (struct dom_node_internal *) *ele;
+ node->base.vtable = &_dom_html_element_vtable;
+ node->vtable = &_protect_vtable;
+
+ return _dom_html_div_element_initialise(doc, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_div_element object
+ *
+ * \param doc The document object
+ * \param ele The dom_html_div_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_div_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_div_element *ele)
+{
+ return _dom_html_element_initialise(doc, &ele->base,
+ doc->memoised[hds_DIV],
+ namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_div_element object
+ *
+ * \param ele The dom_html_div_element object
+ */
+void _dom_html_div_element_finalise(struct dom_html_div_element *ele)
+{
+ _dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_div_element object
+ *
+ * \param ele The dom_html_div_element object
+ */
+void _dom_html_div_element_destroy(struct dom_html_div_element *ele)
+{
+ _dom_html_div_element_finalise(ele);
+ free(ele);
+}
+
+/*------------------------------------------------------------------------*/
+/* The protected virtual functions */
+
+/* The virtual function used to parse attribute value, see src/core/element.c
+ * for detail */
+dom_exception _dom_html_div_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed)
+{
+ UNUSED(ele);
+ UNUSED(name);
+
+ dom_string_ref(value);
+ *parsed = value;
+
+ return DOM_NO_ERR;
+}
+
+/* The virtual destroy function, see src/core/node.c for detail */
+void _dom_virtual_html_div_element_destroy(dom_node_internal *node)
+{
+ _dom_html_div_element_destroy((struct dom_html_div_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_div_element_copy(dom_node_internal *old,
+ dom_node_internal **copy)
+{
+ return _dom_html_element_copy(old, copy);
+}
+
+/*-----------------------------------------------------------------------*/
+/* API functions */
+
+#define SIMPLE_GET(attr) \
+ dom_exception dom_html_div_element_get_##attr( \
+ dom_html_div_element *element, \
+ dom_string **attr) \
+ { \
+ dom_exception ret; \
+ dom_string *_memo_##attr; \
+ \
+ _memo_##attr = \
+ ((struct dom_html_document *) \
+ ((struct dom_node_internal *)element)->owner)->\
+ memoised[hds_##attr]; \
+ \
+ ret = dom_element_get_attribute(element, _memo_##attr, attr); \
+ \
+ return ret; \
+ }
+#define SIMPLE_SET(attr) \
+dom_exception dom_html_div_element_set_##attr( \
+ dom_html_div_element *element, \
+ dom_string *attr) \
+ { \
+ dom_exception ret; \
+ dom_string *_memo_##attr; \
+ \
+ _memo_##attr = \
+ ((struct dom_html_document *) \
+ ((struct dom_node_internal *)element)->owner)->\
+ memoised[hds_##attr]; \
+ \
+ ret = dom_element_set_attribute(element, _memo_##attr, attr); \
+ \
+ return ret; \
+ }
+
+#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr)
+
+SIMPLE_GET_SET(align);
diff --git a/src/html/html_div_element.h b/src/html/html_div_element.h
index 2e182d5..02934d8 100644
--- a/src/html/html_div_element.h
+++ b/src/html/html_div_element.h
@@ -3,5 +3,50 @@
* Licensed under the MIT License,
* http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <[email protected]>
+ * Copyright 2014 Achal Aggarwal<[email protected]>
*/
+#ifndef dom_internal_html_div_element_h_
+#define dom_internal_html_div_element_h_
+
+#include <dom/html/html_div_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_div_element {
+ struct dom_html_element base;
+ /**< The base class */
+};
+
+/* Create a dom_html_div_element object */
+dom_exception _dom_html_div_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_div_element **ele);
+
+/* Initialise a dom_html_div_element object */
+dom_exception _dom_html_div_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_div_element *ele);
+
+/* Finalise a dom_html_div_element object */
+void _dom_html_div_element_finalise(struct dom_html_div_element *ele);
+
+/* Destroy a dom_html_div_element object */
+void _dom_html_div_element_destroy(struct dom_html_div_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_div_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed);
+void _dom_virtual_html_div_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_div_element_copy(dom_node_internal *old,
+ dom_node_internal **copy);
+
+#define DOM_HTML_DIV_ELEMENT_PROTECT_VTABLE \
+ _dom_html_div_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_DIV_ELEMENT \
+ _dom_virtual_html_div_element_destroy, \
+ _dom_html_div_element_copy
+
+#endif
diff --git a/src/html/html_document.c b/src/html/html_document.c
index 0da16bb..cd2b665 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -25,6 +25,7 @@
#include "html/html_option_element.h"
#include "html/html_select_element.h"
#include "html/html_hr_element.h"
+#include "html/html_div_element.h"
#include "core/attr.h"
#include "core/string.h"
@@ -224,6 +225,9 @@
_dom_html_document_create_element_internal(dom_html_document *html,
} else if (dom_string_caseless_isequal(tag_name,
html->memoised[hds_HR])) {
exc = _dom_html_hr_element_create(html, namespace, prefix,
(dom_html_hr_element **) result);
+ } else if (dom_string_caseless_isequal(tag_name,
html->memoised[hds_DIV])) {
+ exc = _dom_html_div_element_create(html, namespace, prefix,
+ (dom_html_div_element **) result);
} else {
exc = _dom_html_element_create(html, tag_name, namespace,
prefix, result);
diff --git a/test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl
b/test/testcases/tests/level1/html/HTMLDivElement01.xml
similarity index 100%
rename from test/testcases/tests/level1/html/HTMLDivElement01.xml.notimpl
rename to test/testcases/tests/level1/html/HTMLDivElement01.xml
--
1.8.3.2
