diff options
author | rsk1994 <rsk1coder99@gmail.com> | 2014-05-17 01:07:12 +0530 |
---|---|---|
committer | Rupinder Singh Khokhar <rsk1coder99@gmail.com> | 2014-06-11 04:27:08 +0530 |
commit | 559ca5e250bc1b902bd2764e05dd8767d1d7ffe6 (patch) | |
tree | f937be27f897c4eec649a6e942e4532b64ed363a | |
parent | 501852e21d843601d2501cfe9cb31a13f259cf50 (diff) | |
download | libdom-559ca5e250bc1b902bd2764e05dd8767d1d7ffe6.tar.gz libdom-559ca5e250bc1b902bd2764e05dd8767d1d7ffe6.tar.bz2 |
Object <object> Element.
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | include/dom/dom.h | 1 | ||||
-rw-r--r-- | include/dom/html/html_object_element.h | 121 | ||||
-rw-r--r-- | src/html/Makefile | 3 | ||||
-rw-r--r-- | src/html/TODO | 2 | ||||
-rw-r--r-- | src/html/html_document.c | 4 | ||||
-rw-r--r-- | src/html/html_document_strings.h | 7 | ||||
-rw-r--r-- | src/html/html_object_element.c | 259 | ||||
-rw-r--r-- | src/html/html_object_element.h | 49 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement01.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement02.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement03.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement04.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement05.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement06.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement07.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement08.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement09.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement10.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement12.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement13.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement14.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement15.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement17.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement18.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/HTMLObjectElement19.xml (renamed from test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/files/object.html | 2 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/files/object.xhtml | 2 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object01.xml (renamed from test/testcases/tests/level1/html/object01.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object02.xml (renamed from test/testcases/tests/level1/html/object02.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object03.xml (renamed from test/testcases/tests/level1/html/object03.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object04.xml (renamed from test/testcases/tests/level1/html/object04.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object05.xml (renamed from test/testcases/tests/level1/html/object05.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object06.xml (renamed from test/testcases/tests/level1/html/object06.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object07.xml (renamed from test/testcases/tests/level1/html/object07.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object09.xml (renamed from test/testcases/tests/level1/html/object09.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object10.xml (renamed from test/testcases/tests/level1/html/object10.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object11.xml (renamed from test/testcases/tests/level1/html/object11.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object12.xml (renamed from test/testcases/tests/level1/html/object12.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object14.xml (renamed from test/testcases/tests/level1/html/object14.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level1/html/object15.xml (renamed from test/testcases/tests/level1/html/object15.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLObjectElement11.xml (renamed from test/testcases/tests/level2/html/HTMLObjectElement11.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLObjectElement16.xml (renamed from test/testcases/tests/level2/html/HTMLObjectElement16.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/HTMLObjectElement20.xml (renamed from test/testcases/tests/level2/html/HTMLObjectElement20.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object.html | 18 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object.xhtml | 20 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object.xml | 20 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object2.html | 17 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object2.xhtml | 20 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/files/object2.xml | 20 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/object08.xml (renamed from test/testcases/tests/level2/html/object08.xml.kfail) | 0 | ||||
-rw-r--r-- | test/testcases/tests/level2/html/object13.xml (renamed from test/testcases/tests/level2/html/object13.xml.kfail) | 0 |
52 files changed, 561 insertions, 5 deletions
@@ -117,6 +117,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_mod_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_anchor_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_basefont_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_image_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_object_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 ea61dfa..1503625 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -76,6 +76,7 @@ #include <dom/html/html_anchor_element.h> #include <dom/html/html_basefont_element.h> #include <dom/html/html_image_element.h> +#include <dom/html/html_object_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_object_element.h b/include/dom/html/html_object_element.h index 2e182d5..0263e85 100644 --- a/include/dom/html/html_object_element.h +++ b/include/dom/html/html_object_element.h @@ -3,5 +3,126 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com> */ +#ifndef dom_html_object_element_h_ +#define dom_html_object_element_h_ + +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include <dom/html/html_form_element.h> +#include <dom/html/html_document.h> + +typedef struct dom_html_object_element dom_html_object_element; + +dom_exception dom_html_object_element_get_form( + dom_html_object_element *ele, dom_html_form_element **form); + +dom_exception dom_html_object_element_get_code( + dom_html_object_element *object, dom_string **code); + +dom_exception dom_html_object_element_set_code( + dom_html_object_element *object, dom_string *code); + +dom_exception dom_html_object_element_get_align( + dom_html_object_element *object, dom_string **align); + +dom_exception dom_html_object_element_set_align( + dom_html_object_element *object, dom_string *align); + +dom_exception dom_html_object_element_get_archive( + dom_html_object_element *object, dom_string **archive); + +dom_exception dom_html_object_element_set_archive( + dom_html_object_element *object, dom_string *archive); + +dom_exception dom_html_object_element_get_border( + dom_html_object_element *object, dom_string **border); + +dom_exception dom_html_object_element_set_border( + dom_html_object_element *object, dom_string *border); + +dom_exception dom_html_object_element_get_code_base( + dom_html_object_element *object, dom_string **code_base); + +dom_exception dom_html_object_element_set_code_base( + dom_html_object_element *object, dom_string *code_base); + +dom_exception dom_html_object_element_get_code_type( + dom_html_object_element *object, dom_string **code_type); + +dom_exception dom_html_object_element_set_code_type( + dom_html_object_element *object, dom_string *code_type); + +dom_exception dom_html_object_element_get_data( + dom_html_object_element *object, dom_string **data); + +dom_exception dom_html_object_element_set_data( + dom_html_object_element *object, dom_string *data); + +dom_exception dom_html_object_element_get_declare( + dom_html_object_element *ele, bool *declare); + +dom_exception dom_html_object_element_set_declare( + dom_html_object_element *ele, bool declare); + +dom_exception dom_html_object_element_get_height( + dom_html_object_element *object, dom_string **height); + +dom_exception dom_html_object_element_set_height( + dom_html_object_element *object, dom_string *height); + +dom_exception dom_html_object_element_get_name( + dom_html_object_element *object, dom_string **name); + +dom_exception dom_html_object_element_set_name( + dom_html_object_element *object, dom_string *name); + +dom_exception dom_html_object_element_get_standby( + dom_html_object_element *object, dom_string **standby); + +dom_exception dom_html_object_element_set_standby( + dom_html_object_element *object, dom_string *standby); + +dom_exception dom_html_object_element_get_type( + dom_html_object_element *object, dom_string **type); + +dom_exception dom_html_object_element_set_type( + dom_html_object_element *object, dom_string *type); + +dom_exception dom_html_object_element_get_use_map( + dom_html_object_element *object, dom_string **use_map); + +dom_exception dom_html_object_element_set_use_map( + dom_html_object_element *object, dom_string *use_map); + +dom_exception dom_html_object_element_get_width( + dom_html_object_element *object, dom_string **width); + +dom_exception dom_html_object_element_set_width( + dom_html_object_element *object, dom_string *width); + +dom_exception dom_html_object_element_get_hspace( + dom_html_object_element *object, int32_t *hspace); + +dom_exception dom_html_object_element_set_hspace( + dom_html_object_element *object, uint32_t hspace); + +dom_exception dom_html_object_element_get_tab_index( + dom_html_object_element *object, int32_t *tab_index); + +dom_exception dom_html_object_element_set_tab_index( + dom_html_object_element *object, uint32_t tab_index); + +dom_exception dom_html_object_element_get_vspace( + dom_html_object_element *object, int32_t *vspace); + +dom_exception dom_html_object_element_set_vspace( + dom_html_object_element *object, uint32_t vspace); + +dom_exception dom_html_object_element_get_content_document( + dom_html_object_element *object, dom_document **content_document); +#endif diff --git a/src/html/Makefile b/src/html/Makefile index b02fd54..455ea21 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -13,10 +13,9 @@ DIR_SOURCES := \ html_pre_element.c html_br_element.c html_label_element.c \ html_ulist_element.c html_olist_element.c html_li_element.c \ html_font_element.c html_mod_element.c html_anchor_element.c \ - html_basefont_element.c html_image_element.c + html_basefont_element.c html_image_element.c html_object_element.c UNINMPLEMENTED_SOURCES := \ - html_object_element.c \ html_param_element.c html_applet_element.c html_map_element.c \ html_area_element.c html_script_element.c html_table_element.c \ html_tablecaption_element.c html_tablecol_element.c html_tablesection_element.c \ diff --git a/src/html/TODO b/src/html/TODO index ddca8c4..c61adbd 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -40,7 +40,7 @@ HTMLHRElement html_hr_element DONE HTMLModElement html_mod_element DONE HTMLAnchorElement html_anchor_element DONE HTMLImageElement html_image_element DONE -HTMLObjectElement html_object_element MISSING +HTMLObjectElement html_object_element DONE HTMLParamElement html_param_element MISSING HTMLAppletElement html_applet_element MISSING HTMLMapElement html_map_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index 28e3ac0..ae80712 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -44,6 +44,7 @@ #include "html/html_anchor_element.h" #include "html/html_basefont_element.h" #include "html/html_image_element.h" +#include "html/html_object_element.h" #include "core/attr.h" #include "core/string.h" @@ -307,6 +308,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_IMG])) { exc = _dom_html_image_element_create(html, namespace, prefix, (dom_html_image_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_OBJECT])) { + exc = _dom_html_object_element_create(html, namespace, prefix, + (dom_html_object_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index dae686c..e23cc0b 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -90,10 +90,17 @@ HTML_DOCUMENT_STRINGS_ACTION1(face) HTML_DOCUMENT_STRINGS_ACTION1(coords) HTML_DOCUMENT_STRINGS_ACTION1(shape) HTML_DOCUMENT_STRINGS_ACTION1(border) +HTML_DOCUMENT_STRINGS_ACTION1(code) +HTML_DOCUMENT_STRINGS_ACTION1(archive) +HTML_DOCUMENT_STRINGS_ACTION1(data) +HTML_DOCUMENT_STRINGS_ACTION1(height) +HTML_DOCUMENT_STRINGS_ACTION1(standby) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) HTML_DOCUMENT_STRINGS_ACTION(long_desc,longdesc) +HTML_DOCUMENT_STRINGS_ACTION(code_base,codebase) +HTML_DOCUMENT_STRINGS_ACTION(code_type,codetype) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_object_element.c b/src/html/html_object_element.c index 2e182d5..7da4567 100644 --- a/src/html/html_object_element.c +++ b/src/html/html_object_element.c @@ -3,5 +3,264 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_object_element.h> + +#include "html/html_document.h" +#include "html/html_object_element.h" + +#include "html/html_form_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_OBJECT_ELEMENT + }, + DOM_HTML_OBJECT_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_object_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_object_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_object_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_object_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_object_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_object_element object + * + * \param doc The document object + * \param ele The dom_html_object_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_object_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_object_element *ele) +{ + ele->form = NULL; + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_OBJECT], + namespace, prefix); +} + +/** + * Finalise a dom_html_object_element object + * + * \param ele The dom_html_object_element object + */ +void _dom_html_object_element_finalise(struct dom_html_object_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_object_element object + * + * \param ele The dom_html_object_element object + */ +void _dom_html_object_element_destroy(struct dom_html_object_element *ele) +{ + _dom_html_object_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_object_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_object_element_destroy(dom_node_internal *node) +{ + _dom_html_object_element_destroy((struct dom_html_object_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_object_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_object_element_get_##attr( \ + dom_html_object_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_object_element_set_##attr( \ + dom_html_object_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(code); +SIMPLE_GET_SET(align); +SIMPLE_GET_SET(archive); +SIMPLE_GET_SET(border); +SIMPLE_GET_SET(code_base); +SIMPLE_GET_SET(code_type); +SIMPLE_GET_SET(data); +SIMPLE_GET_SET(height); +SIMPLE_GET_SET(name); +SIMPLE_GET_SET(standby); +SIMPLE_GET_SET(type); +SIMPLE_GET_SET(use_map); +SIMPLE_GET_SET(width); + +dom_exception dom_html_object_element_get_hspace( + dom_html_object_element *object, int32_t *hspace) +{ + return dom_html_element_get_int32_t_property(&object->base, "hspace", + SLEN("hspace"), hspace); +} + +dom_exception dom_html_object_element_set_hspace( + dom_html_object_element *object, uint32_t hspace) +{ + return dom_html_element_set_int32_t_property(&object->base, "hspace", + SLEN("hspace"), hspace); +} + +dom_exception dom_html_object_element_get_vspace( + dom_html_object_element *object, int32_t *vspace) +{ + return dom_html_element_get_int32_t_property(&object->base, "vspace", + SLEN("vspace"), vspace); +} + +dom_exception dom_html_object_element_set_vspace( + dom_html_object_element *object, uint32_t vspace) +{ + return dom_html_element_set_int32_t_property(&object->base, "vspace", + SLEN("vspace"), vspace); +} + +dom_exception dom_html_object_element_get_tab_index( + dom_html_object_element *object, int32_t *tab_index) +{ + return dom_html_element_get_int32_t_property(&object->base, "tabindex", + SLEN("tabindex"), tab_index); +} + +dom_exception dom_html_object_element_set_tab_index( + dom_html_object_element *object, uint32_t tab_index) +{ + return dom_html_element_set_int32_t_property(&object->base, "tabindex", + SLEN("tabindex"), tab_index); +} + +dom_exception dom_html_object_element_get_declare(dom_html_object_element *ele, + bool *declare) +{ + return dom_html_element_get_bool_property(&ele->base, "declare", + SLEN("declare"), declare); +} + +dom_exception dom_html_object_element_set_declare(dom_html_object_element *ele, + bool declare) +{ + return dom_html_element_set_bool_property(&ele->base, "declare", + SLEN("declare"), declare); +} + +dom_exception dom_html_object_element_get_form( + dom_html_object_element *object, dom_html_form_element **form) +{ + dom_html_document *doc + = (dom_html_document *) ((dom_node_internal *) object)->owner; + dom_node_internal *form_tmp = ((dom_node_internal *) object)->parent; + + while (form_tmp != NULL) { + if (form_tmp->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(form_tmp->name, + doc->memoised[hds_FORM])) + break; + + form_tmp = form_tmp->parent; + } + + if (form_tmp != NULL) { + *form = (dom_html_form_element *) form_tmp; + return DOM_NO_ERR; + } + + *form = NULL; + + return DOM_NO_ERR; +} + +dom_exception dom_html_object_element_get_content_document( + dom_html_object_element *object, dom_document **content_document) +{ + *content_document = (((dom_node_internal *) object)->owner); + return DOM_NO_ERR; +} + diff --git a/src/html/html_object_element.h b/src/html/html_object_element.h index 2e182d5..83512d6 100644 --- a/src/html/html_object_element.h +++ b/src/html/html_object_element.h @@ -3,5 +3,54 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku@gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99@gmail.com> */ +#ifndef dom_internal_html_object_element_h_ +#define dom_internal_html_object_element_h_ + +#include <dom/html/html_object_element.h> + +#include "html/html_element.h" + +struct dom_html_object_element { + struct dom_html_element base; + /**< The base class */ + dom_html_form_element *form; + /**< The form associated with object */ +}; + +/* Create a dom_html_object_element object */ +dom_exception _dom_html_object_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_object_element **ele); + +/* Initialise a dom_html_object_element object */ +dom_exception _dom_html_object_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_object_element *ele); + +/* Finalise a dom_html_object_element object */ +void _dom_html_object_element_finalise(struct dom_html_object_element *ele); + +/* Destroy a dom_html_object_element object */ +void _dom_html_object_element_destroy(struct dom_html_object_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_object_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); + +void _dom_virtual_html_object_element_destroy(dom_node_internal *node); +dom_exception _dom_html_object_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_OBJECT_ELEMENT_PROTECT_VTABLE \ + _dom_html_object_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_OBJECT_ELEMENT \ + _dom_virtual_html_object_element_destroy, \ + _dom_html_object_element_copy + +#endif + diff --git a/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement01.xml index 9b39aaf..9b39aaf 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement01.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement01.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement02.xml index 52539a5..52539a5 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement02.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement02.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement03.xml index 086f0d9..086f0d9 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement03.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement03.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement04.xml index c4091ec..c4091ec 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement04.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement04.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement05.xml index 5348c20..5348c20 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement05.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement05.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement06.xml index 974fd88..974fd88 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement06.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement06.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement07.xml index 8e2c5d2..8e2c5d2 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement07.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement07.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement08.xml index f5fd14c..f5fd14c 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement08.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement08.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement09.xml index 8c6ca17..8c6ca17 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement09.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement09.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement10.xml index b0f0c8b..b0f0c8b 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement10.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement10.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement12.xml index 8ef377d..8ef377d 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement12.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement12.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement13.xml index 0e764de..0e764de 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement13.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement13.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement14.xml index 0fa56d3..0fa56d3 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement14.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement14.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement15.xml index 07d3c97..07d3c97 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement15.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement15.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement17.xml index caabb88..caabb88 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement17.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement17.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement18.xml index f994859..f994859 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement18.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement18.xml diff --git a/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLObjectElement19.xml index 51d1115..51d1115 100644 --- a/test/testcases/tests/level1/html/HTMLObjectElement19.xml.kfail +++ b/test/testcases/tests/level1/html/HTMLObjectElement19.xml diff --git a/test/testcases/tests/level1/html/files/object.html b/test/testcases/tests/level1/html/files/object.html index 7960549..c7fbab1 100644 --- a/test/testcases/tests/level1/html/files/object.html +++ b/test/testcases/tests/level1/html/files/object.html @@ -6,7 +6,7 @@ </HEAD> <BODY onload="parent.loadComplete()"> <P> -<OBJECT ALIGN="middle" ARCHIVE="" BORDER="0" CODEBASE="http://www.w3.org/DOM/" DATA="./pix/logo.gif" HEIGHT="60" HSPACE="0" STANDBY="Loading Image ..." TABINDEX="0" TYPE="image/gif" USEMAP="#DivLogo-map" VSPACE="0" WIDTH="550"></OBJECT> +<OBJECT ALIGN="middle" ARCHIVE="" BORDER="0" CODEBASE="http://xw2k.sdct.itl.nist.gov/brady/dom/" DATA="./pix/logo.gif" HEIGHT="60" HSPACE="0" STANDBY="Loading Image ..." TABINDEX="0" TYPE="image/gif" USEMAP="#DivLogo-map" VSPACE="0" WIDTH="550"></OBJECT> </P> <FORM NAME="OBJECT2" ACTION="./files/getData.pl" METHOD="post"> <P> diff --git a/test/testcases/tests/level1/html/files/object.xhtml b/test/testcases/tests/level1/html/files/object.xhtml index 3399588..824f7fc 100644 --- a/test/testcases/tests/level1/html/files/object.xhtml +++ b/test/testcases/tests/level1/html/files/object.xhtml @@ -8,7 +8,7 @@ </head> <body onload="parent.loadComplete()"> <p> -<object align="middle" archive="" border="0" codebase="http://www.w3.org/DOM/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> +<object align="middle" archive="" border="0" codebase="http://xw2k.sdct.itl.nist.gov/brady/dom/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> </p> <form name="OBJECT2" action="./files/getData.pl" method="post"> <p> diff --git a/test/testcases/tests/level1/html/object01.xml.kfail b/test/testcases/tests/level1/html/object01.xml index 52e053c..52e053c 100644 --- a/test/testcases/tests/level1/html/object01.xml.kfail +++ b/test/testcases/tests/level1/html/object01.xml diff --git a/test/testcases/tests/level1/html/object02.xml.kfail b/test/testcases/tests/level1/html/object02.xml index fc3c215..fc3c215 100644 --- a/test/testcases/tests/level1/html/object02.xml.kfail +++ b/test/testcases/tests/level1/html/object02.xml diff --git a/test/testcases/tests/level1/html/object03.xml.kfail b/test/testcases/tests/level1/html/object03.xml index e2591ad..e2591ad 100644 --- a/test/testcases/tests/level1/html/object03.xml.kfail +++ b/test/testcases/tests/level1/html/object03.xml diff --git a/test/testcases/tests/level1/html/object04.xml.kfail b/test/testcases/tests/level1/html/object04.xml index 33a99a5..33a99a5 100644 --- a/test/testcases/tests/level1/html/object04.xml.kfail +++ b/test/testcases/tests/level1/html/object04.xml diff --git a/test/testcases/tests/level1/html/object05.xml.kfail b/test/testcases/tests/level1/html/object05.xml index 93e2967..93e2967 100644 --- a/test/testcases/tests/level1/html/object05.xml.kfail +++ b/test/testcases/tests/level1/html/object05.xml diff --git a/test/testcases/tests/level1/html/object06.xml.kfail b/test/testcases/tests/level1/html/object06.xml index 6f9e613..6f9e613 100644 --- a/test/testcases/tests/level1/html/object06.xml.kfail +++ b/test/testcases/tests/level1/html/object06.xml diff --git a/test/testcases/tests/level1/html/object07.xml.kfail b/test/testcases/tests/level1/html/object07.xml index aff1fcc..aff1fcc 100644 --- a/test/testcases/tests/level1/html/object07.xml.kfail +++ b/test/testcases/tests/level1/html/object07.xml diff --git a/test/testcases/tests/level1/html/object09.xml.kfail b/test/testcases/tests/level1/html/object09.xml index 4b9d336..4b9d336 100644 --- a/test/testcases/tests/level1/html/object09.xml.kfail +++ b/test/testcases/tests/level1/html/object09.xml diff --git a/test/testcases/tests/level1/html/object10.xml.kfail b/test/testcases/tests/level1/html/object10.xml index 7dd5741..7dd5741 100644 --- a/test/testcases/tests/level1/html/object10.xml.kfail +++ b/test/testcases/tests/level1/html/object10.xml diff --git a/test/testcases/tests/level1/html/object11.xml.kfail b/test/testcases/tests/level1/html/object11.xml index 332ca50..332ca50 100644 --- a/test/testcases/tests/level1/html/object11.xml.kfail +++ b/test/testcases/tests/level1/html/object11.xml diff --git a/test/testcases/tests/level1/html/object12.xml.kfail b/test/testcases/tests/level1/html/object12.xml index 4af4455..4af4455 100644 --- a/test/testcases/tests/level1/html/object12.xml.kfail +++ b/test/testcases/tests/level1/html/object12.xml diff --git a/test/testcases/tests/level1/html/object14.xml.kfail b/test/testcases/tests/level1/html/object14.xml index 0a8fce5..0a8fce5 100644 --- a/test/testcases/tests/level1/html/object14.xml.kfail +++ b/test/testcases/tests/level1/html/object14.xml diff --git a/test/testcases/tests/level1/html/object15.xml.kfail b/test/testcases/tests/level1/html/object15.xml index 37182c0..37182c0 100644 --- a/test/testcases/tests/level1/html/object15.xml.kfail +++ b/test/testcases/tests/level1/html/object15.xml diff --git a/test/testcases/tests/level2/html/HTMLObjectElement11.xml.kfail b/test/testcases/tests/level2/html/HTMLObjectElement11.xml index b4f172b..b4f172b 100644 --- a/test/testcases/tests/level2/html/HTMLObjectElement11.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLObjectElement11.xml diff --git a/test/testcases/tests/level2/html/HTMLObjectElement16.xml.kfail b/test/testcases/tests/level2/html/HTMLObjectElement16.xml index e849620..e849620 100644 --- a/test/testcases/tests/level2/html/HTMLObjectElement16.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLObjectElement16.xml diff --git a/test/testcases/tests/level2/html/HTMLObjectElement20.xml.kfail b/test/testcases/tests/level2/html/HTMLObjectElement20.xml index 5694760..5694760 100644 --- a/test/testcases/tests/level2/html/HTMLObjectElement20.xml.kfail +++ b/test/testcases/tests/level2/html/HTMLObjectElement20.xml diff --git a/test/testcases/tests/level2/html/files/object.html b/test/testcases/tests/level2/html/files/object.html new file mode 100644 index 0000000..c7fbab1 --- /dev/null +++ b/test/testcases/tests/level2/html/files/object.html @@ -0,0 +1,18 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - OBJECT</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()"> +<P> +<OBJECT ALIGN="middle" ARCHIVE="" BORDER="0" CODEBASE="http://xw2k.sdct.itl.nist.gov/brady/dom/" DATA="./pix/logo.gif" HEIGHT="60" HSPACE="0" STANDBY="Loading Image ..." TABINDEX="0" TYPE="image/gif" USEMAP="#DivLogo-map" VSPACE="0" WIDTH="550"></OBJECT> +</P> +<FORM NAME="OBJECT2" ACTION="./files/getData.pl" METHOD="post"> +<P> +<OBJECT DECLARE="declare" NAME="OBJECT2" CODETYPE="image/gif"></OBJECT> +</P> +</FORM> +</BODY> +</HTML> + diff --git a/test/testcases/tests/level2/html/files/object.xhtml b/test/testcases/tests/level2/html/files/object.xhtml new file mode 100644 index 0000000..824f7fc --- /dev/null +++ b/test/testcases/tests/level2/html/files/object.xhtml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - OBJECT</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<object align="middle" archive="" border="0" codebase="http://xw2k.sdct.itl.nist.gov/brady/dom/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> +</p> +<form name="OBJECT2" action="./files/getData.pl" method="post"> +<p> +<object declare="declare" name="OBJECT2" codetype="image/gif"></object> +</p> +</form> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/object.xml b/test/testcases/tests/level2/html/files/object.xml new file mode 100644 index 0000000..824f7fc --- /dev/null +++ b/test/testcases/tests/level2/html/files/object.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - OBJECT</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<object align="middle" archive="" border="0" codebase="http://xw2k.sdct.itl.nist.gov/brady/dom/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> +</p> +<form name="OBJECT2" action="./files/getData.pl" method="post"> +<p> +<object declare="declare" name="OBJECT2" codetype="image/gif"></object> +</p> +</form> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/object2.html b/test/testcases/tests/level2/html/files/object2.html new file mode 100644 index 0000000..0a39363 --- /dev/null +++ b/test/testcases/tests/level2/html/files/object2.html @@ -0,0 +1,17 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - OBJECT</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()"> +<P> +<OBJECT ALIGN="middle" ARCHIVE="" BORDER="0" CODEBASE="http://www.w3.org/DOM/" DATA="./pix/logo.gif" HEIGHT="60" HSPACE="0" STANDBY="Loading Image ..." TABINDEX="0" TYPE="image/gif" USEMAP="#DivLogo-map" VSPACE="0" WIDTH="550"></OBJECT> +</P> +<FORM ID="object2" ACTION="./files/getData.pl" METHOD="post"> +<P> +<OBJECT DECLARE="declare" NAME="OBJECT2" CODETYPE="image/gif"></OBJECT> +</P> +</FORM> +</BODY> +</HTML> diff --git a/test/testcases/tests/level2/html/files/object2.xhtml b/test/testcases/tests/level2/html/files/object2.xhtml new file mode 100644 index 0000000..e318a3c --- /dev/null +++ b/test/testcases/tests/level2/html/files/object2.xhtml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - OBJECT</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<object align="middle" archive="" border="0" codebase="http://www.w3.org/DOM/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> +</p> +<form id="object2" action="./files/getData.pl" method="post"> +<p> +<object declare="declare" name="OBJECT2" codetype="image/gif"></object> +</p> +</form> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/object2.xml b/test/testcases/tests/level2/html/files/object2.xml new file mode 100644 index 0000000..a41e03d --- /dev/null +++ b/test/testcases/tests/level2/html/files/object2.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - OBJECT</title> +</head> +<body onload="parent.loadComplete()"> +<p> +<object align="middle" archive="" border="0" codebase="http://xw2k.sdct.itl.nist.gov/brady/dom/" data="./pix/logo.gif" height="60" hspace="0" standby="Loading Image ..." tabindex="0" type="image/gif" usemap="#DivLogo-map" vspace="0" width="550"></object> +</p> +<form id="object2" action="./files/getData.pl" method="post"> +<p> +<object declare="declare" name="OBJECT2" codetype="image/gif"></object> +</p> +</form> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/object08.xml.kfail b/test/testcases/tests/level2/html/object08.xml index 32d32cf..32d32cf 100644 --- a/test/testcases/tests/level2/html/object08.xml.kfail +++ b/test/testcases/tests/level2/html/object08.xml diff --git a/test/testcases/tests/level2/html/object13.xml.kfail b/test/testcases/tests/level2/html/object13.xml index a3a603a..a3a603a 100644 --- a/test/testcases/tests/level2/html/object13.xml.kfail +++ b/test/testcases/tests/level2/html/object13.xml |