Gitweb links:
...log
http://git.netsurf-browser.org/libdom.git/shortlog/12d3f1b1de5b47f710cb02...
...commit
http://git.netsurf-browser.org/libdom.git/commit/12d3f1b1de5b47f710cb02d7...
...tree
http://git.netsurf-browser.org/libdom.git/tree/12d3f1b1de5b47f710cb02d7d4...
The branch, rupindersingh/dlist has been created
at 12d3f1b1de5b47f710cb02d7d4b4136219ea5603 (commit)
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libdom.git/commit/?id=12d3f1b1de5b47f710cb...
commit 12d3f1b1de5b47f710cb02d7d4b4136219ea5603
Author: rsk1994 <rsk1coder99(a)gmail.com>
Commit: rsk1994 <rsk1coder99(a)gmail.com>
adding DL element rev.1
diff --git a/Makefile b/Makefile
index c6bc2bd..4c6906f 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_dlist_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..12245c2 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_dlist_element.h>
/* DOM Events header */
#include <dom/events/events.h>
diff --git a/include/dom/html/html_dlist_element.h
b/include/dom/html/html_dlist_element.h
index 2e182d5..e537994 100644
--- a/include/dom/html/html_dlist_element.h
+++ b/include/dom/html/html_dlist_element.h
@@ -3,5 +3,21 @@
* Licensed under the MIT License,
*
http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com>
*/
+#ifndef dom_html_d_list_element_h_
+#define dom_html_d_list_element_h_
+#include <stdbool.h>
+#include <dom/core/exceptions.h>
+#include <dom/core/string.h>
+
+typedef struct dom_html_d_list_element dom_html_d_list_element;
+
+dom_exception dom_html_d_list_element_get_compact(
+ dom_html_d_list_element *ele, bool *compact);
+
+dom_exception dom_html_d_list_element_set_compact(
+ dom_html_d_list_element *ele, bool compact);
+
+#endif
diff --git a/src/html/Makefile b/src/html/Makefile
index 5226b53..25e99f4 100644
--- a/src/html/Makefile
+++ b/src/html/Makefile
@@ -6,12 +6,13 @@ 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_dlist_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_directory_element.c html_menu_element.c \
html_li_element.c html_div_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 \
diff --git a/src/html/html_dlist_element.c b/src/html/html_dlist_element.c
index 2e182d5..c79ad6c 100644
--- a/src/html/html_dlist_element.c
+++ b/src/html/html_dlist_element.c
@@ -3,5 +3,145 @@
* Licensed under the MIT License,
*
http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com>
*/
+#include <assert.h>
+#include <stdlib.h>
+
+#include <dom/html/html_dlist_element.h>
+
+#include "html/html_document.h"
+#include "html/html_dlist_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_DL_ELEMENT
+ },
+ DOM_HTML_DL_ELEMENT_PROTECT_VTABLE
+};
+
+/**
+ * Create a dom_html_d_list_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_d_list_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_d_list_element **ele)
+{
+ struct dom_node_internal *node;
+
+ *ele = malloc(sizeof(dom_html_d_list_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_d_list_element_initialise(doc, namespace, prefix, *ele);
+}
+
+/**
+ * Initialise a dom_html_d_list_element object
+ *
+ * \param doc The document object
+ * \param ele The dom_html_d_list_element object
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_d_list_element *ele)
+{
+ return _dom_html_element_initialise(doc, &ele->base,
+ doc->memoised[hds_DL],
+ namespace, prefix);
+}
+
+/**
+ * Finalise a dom_html_d_list_element object
+ *
+ * \param ele The dom_html_d_list_element object
+ */
+void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele)
+{
+ _dom_html_element_finalise(&ele->base);
+}
+
+/**
+ * Destroy a dom_html_d_list_element object
+ *
+ * \param ele The dom_html_d_list_element object
+ */
+void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele)
+{
+ _dom_html_d_list_element_finalise(ele);
+ free(ele);
+}
+
+/**
+ * Get the compact property
+ *
+ * \param ele The dom_html_d_list_element object
+ * \param compact The status
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_d_list_element_get_compact(dom_html_d_list_element *ele,
+ bool *compact)
+{
+ return dom_html_element_get_bool_property(&ele->base,
"compact",
+ SLEN("compact"), compact);
+}
+
+/**
+ * Set the compact property
+ *
+ * \param ele The dom_html_d_list_element object
+ * \param compact The status
+ * \return DOM_NO_ERR on success, appropriate dom_exception on failure.
+ */
+dom_exception dom_html_d_list_element_set_compact(dom_html_d_list_element *ele,
+ bool compact)
+{
+ return dom_html_element_set_bool_property(&ele->base,
"compact",
+ SLEN("compact"), compact);
+}
+
+/*------------------------------------------------------------------------*/
+/* The protected virtual functions */
+
+/* The virtual function used to parse attribute value, see src/core/element.c
+ * for detail */
+dom_exception _dom_html_d_list_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_d_list_element_destroy(dom_node_internal *node)
+{
+ _dom_html_d_list_element_destroy((struct dom_html_d_list_element *) node);
+}
+
+/* The virtual copy function, see src/core/node.c for detail */
+dom_exception _dom_html_d_list_element_copy(dom_node_internal *old,
+ dom_node_internal **copy)
+{
+ return _dom_html_element_copy(old, copy);
+}
diff --git a/src/html/html_dlist_element.h b/src/html/html_dlist_element.h
index 2e182d5..8e40dca 100644
--- a/src/html/html_dlist_element.h
+++ b/src/html/html_dlist_element.h
@@ -3,5 +3,50 @@
* Licensed under the MIT License,
*
http://www.opensource.org/licenses/mit-license.php
* Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com>
+ * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com>
*/
+#ifndef dom_internal_html_d_list_element_h_
+#define dom_internal_html_d_list_element_h_
+
+#include <dom/html/html_dlist_element.h>
+#include "html/html_element.h"
+
+
+struct dom_html_d_list_element {
+ struct dom_html_element base;
+ /**< The base class */
+};
+
+/* Create a dom_html_d_list_element object */
+dom_exception _dom_html_d_list_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_d_list_element **ele);
+
+/* Initialise a dom_html_d_list_element object */
+dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
+ struct dom_html_d_list_element *ele);
+
+/* Finalise a dom_html_d_list_element object */
+void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele);
+
+/* Destroy a dom_html_d_list_element object */
+void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele);
+
+/* The protected virtual functions */
+dom_exception _dom_html_d_list_element_parse_attribute(dom_element *ele,
+ dom_string *name, dom_string *value,
+ dom_string **parsed);
+void _dom_virtual_html_d_list_element_destroy(dom_node_internal *node);
+dom_exception _dom_html_d_list_element_copy(dom_node_internal *old,
+ dom_node_internal **copy);
+
+#define DOM_HTML_DL_ELEMENT_PROTECT_VTABLE \
+ _dom_html_d_list_element_parse_attribute
+
+#define DOM_NODE_PROTECT_VTABLE_HTML_DL_ELEMENT \
+ _dom_virtual_html_d_list_element_destroy, \
+ _dom_html_d_list_element_copy
+
+#endif
diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h
index 8e9d79e..90f3b59 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -96,6 +96,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(selected)
/* HTMLSelectElement strings */
HTML_DOCUMENT_STRINGS_ACTION(select_multiple,select-multiple)
HTML_DOCUMENT_STRINGS_ACTION(select_one,select-one)
+/* HTMLDlist attributes */
+HTML_DOCUMENT_STRINGS_ACTION1(compact)
/* Some event strings for later */
HTML_DOCUMENT_STRINGS_ACTION1(blur)
HTML_DOCUMENT_STRINGS_ACTION1(focus)
diff --git a/test/testcases/tests/level1/html/HTMLDlistElement01.xml
b/test/testcases/tests/level1/html/HTMLDlistElement01.xml
new file mode 100644
index 0000000..727c189
--- /dev/null
+++ b/test/testcases/tests/level1/html/HTMLDlistElement01.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+
+<!--
+
+Copyright (c) 2001 World Wide Web Consortium,
+(Massachusetts Institute of Technology, Institut National de
+Recherche en Informatique et en Automatique, Keio University). All
+Rights Reserved. This program is distributed under the W3C's Software
+Intellectual Property License. This program is distributed in the
+hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
+
+See W3C License
http://www.w3.org/Consortium/Legal/ for more details.
+
+-->
+<!DOCTYPE test SYSTEM "dom1.dtd">
+<test
xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1"
name="HTMLDlistElement01">
+<metadata>
+<title>HTMLDListElement01</title>
+<creator>NIST</creator>
+<description>
+ The compact attribute specifies a boolean value on whether to display
+ the list more compactly.
+
+ Retrieve the compact attribute and examine its value.
+</description>
+<contributor>Mary Brady</contributor>
+<date qualifier="created">2002-02-22</date>
+<subject
resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-o...
+</metadata>
+<var name="nodeList" type="NodeList"/>
+<var name="testNode" type="Node"/>
+<var name="vcompact" type="boolean" />
+<var name="doc" type="Document"/>
+<load var="doc" href="dl" willBeModified="false"/>
+<getElementsByTagName interface="Document" obj="doc"
var="nodeList" tagname='"dl"'/>
+<assertSize collection="nodeList" size="1"
id="Asize"/>
+<item interface="NodeList" obj="nodeList" var="testNode"
index="0"/>
+<compact interface="HTMLDListElement" obj="testNode"
var="vcompact"/>
+<assertTrue actual="vcompact" id="compactLink"/>
+</test>
diff --git a/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
b/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
deleted file mode 100644
index 727c189..0000000
--- a/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
-
-<!--
-
-Copyright (c) 2001 World Wide Web Consortium,
-(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All
-Rights Reserved. This program is distributed under the W3C's Software
-Intellectual Property License. This program is distributed in the
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE.
-
-See W3C License
http://www.w3.org/Consortium/Legal/ for more details.
-
--->
-<!DOCTYPE test SYSTEM "dom1.dtd">
-<test
xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1"
name="HTMLDlistElement01">
-<metadata>
-<title>HTMLDListElement01</title>
-<creator>NIST</creator>
-<description>
- The compact attribute specifies a boolean value on whether to display
- the list more compactly.
-
- Retrieve the compact attribute and examine its value.
-</description>
-<contributor>Mary Brady</contributor>
-<date qualifier="created">2002-02-22</date>
-<subject
resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-o...
-</metadata>
-<var name="nodeList" type="NodeList"/>
-<var name="testNode" type="Node"/>
-<var name="vcompact" type="boolean" />
-<var name="doc" type="Document"/>
-<load var="doc" href="dl" willBeModified="false"/>
-<getElementsByTagName interface="Document" obj="doc"
var="nodeList" tagname='"dl"'/>
-<assertSize collection="nodeList" size="1"
id="Asize"/>
-<item interface="NodeList" obj="nodeList" var="testNode"
index="0"/>
-<compact interface="HTMLDListElement" obj="testNode"
var="vcompact"/>
-<assertTrue actual="vcompact" id="compactLink"/>
-</test>
-----------------------------------------------------------------------
--
Document Object Model library