From 9c7a1bb6872159035fd6b4640cf9ec62b8630b54 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sat, 7 Jul 2012 17:59:30 +0100 Subject: HTMLLinkElement: Implement and enable tests --- src/html/html_document.c | 6 ++++ src/html/html_document_strings.h | 11 +++++++- src/html/html_link_element.c | 61 ++++++++++++++++++++++++++++++++-------- src/html/html_link_element.h | 2 ++ 4 files changed, 67 insertions(+), 13 deletions(-) (limited to 'src/html') diff --git a/src/html/html_document.c b/src/html/html_document.c index 69b40eb..ae36454 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -13,6 +13,7 @@ #include "html/html_collection.h" #include "html/html_html_element.h" #include "html/html_head_element.h" +#include "html/html_link_element.h" #include "html/html_title_element.h" #include "html/html_form_element.h" @@ -182,6 +183,11 @@ _dom_html_document_create_element_internal(dom_html_document *html, (dom_html_form_element **) result); } + if (dom_string_caseless_isequal(tag_name, html->memoised[hds_LINK])) { + return _dom_html_link_element_create(html, namespace, prefix, + (dom_html_link_element **) result); + } + return _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 c179e0b..b092c9e 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -36,12 +36,21 @@ HTML_DOCUMENT_STRINGS_ACTION1(class) HTML_DOCUMENT_STRINGS_ACTION1(version) /* Useful attributes used by HTMLHeadElement */ HTML_DOCUMENT_STRINGS_ACTION1(profile) +/* Useful attributes used by HTMLLinkElement */ +HTML_DOCUMENT_STRINGS_ACTION1(charset) +HTML_DOCUMENT_STRINGS_ACTION1(href) +HTML_DOCUMENT_STRINGS_ACTION1(hreflang) +HTML_DOCUMENT_STRINGS_ACTION1(media) +HTML_DOCUMENT_STRINGS_ACTION1(rel) +HTML_DOCUMENT_STRINGS_ACTION1(rev) +HTML_DOCUMENT_STRINGS_ACTION1(target) +HTML_DOCUMENT_STRINGS_ACTION1(type) /* Useful attributes used by HTMLFormElement */ HTML_DOCUMENT_STRINGS_ACTION(accept_charset,accept-charset) HTML_DOCUMENT_STRINGS_ACTION1(action) HTML_DOCUMENT_STRINGS_ACTION1(enctype) HTML_DOCUMENT_STRINGS_ACTION1(method) -HTML_DOCUMENT_STRINGS_ACTION1(target) +/* HTML_DOCUMENT_STRINGS_ACTION1(target) */ /* Names for elements which get specialised. */ HTML_DOCUMENT_STRINGS_ACTION1(HTML) HTML_DOCUMENT_STRINGS_ACTION1(HEAD) diff --git a/src/html/html_link_element.c b/src/html/html_link_element.c index 92ca4f5..cf3d0e9 100644 --- a/src/html/html_link_element.c +++ b/src/html/html_link_element.c @@ -8,6 +8,7 @@ #include #include +#include "html/html_document.h" #include "html/html_link_element.h" #include "core/node.h" @@ -29,6 +30,7 @@ static struct dom_element_protected_vtable _protect_vtable = { * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_html_link_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, struct dom_html_link_element **ele) { struct dom_node_internal *node; @@ -42,7 +44,7 @@ dom_exception _dom_html_link_element_create(struct dom_html_document *doc, node->base.vtable = &_dom_element_vtable; node->vtable = &_protect_vtable; - return _dom_html_link_element_initialise(doc, *ele); + return _dom_html_link_element_initialise(doc, namespace, prefix, *ele); } /** @@ -53,19 +55,12 @@ dom_exception _dom_html_link_element_create(struct dom_html_document *doc, * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_html_link_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, struct dom_html_link_element *ele) { - dom_string *name = NULL; - dom_exception err; - - err = dom_string_create((const uint8_t *) "HEAD", SLEN("HEAD"), &name); - if (err != DOM_NO_ERR) - return err; - - err = _dom_html_element_initialise(doc, &ele->base, name, NULL, NULL); - dom_string_unref(name); - - return err; + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_LINK], + namespace, prefix); } /** @@ -151,3 +146,45 @@ dom_exception _dom_html_link_element_copy(dom_node_internal *old, return _dom_html_element_copy(old, copy); } +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET_SET(fattr,attr) \ +dom_exception dom_html_link_element_get_##fattr(dom_html_link_element *element, \ + dom_string **fattr) \ +{ \ + 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, fattr); \ + \ + return ret; \ +} \ + \ +dom_exception dom_html_link_element_set_##fattr(dom_html_link_element *element, \ + dom_string *fattr) \ +{ \ + 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, fattr); \ + \ + return ret; \ +} + +SIMPLE_GET_SET(charset,charset) +SIMPLE_GET_SET(href,href) +SIMPLE_GET_SET(hreflang,hreflang) +SIMPLE_GET_SET(media,media) +SIMPLE_GET_SET(rel,rel) +SIMPLE_GET_SET(rev,rev) +SIMPLE_GET_SET(target,target) +SIMPLE_GET_SET(type,type) diff --git a/src/html/html_link_element.h b/src/html/html_link_element.h index b281cfb..960dcdc 100644 --- a/src/html/html_link_element.h +++ b/src/html/html_link_element.h @@ -19,10 +19,12 @@ struct dom_html_link_element { /* Create a dom_html_link_element object */ dom_exception _dom_html_link_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, struct dom_html_link_element **ele); /* Initialise a dom_html_link_element object */ dom_exception _dom_html_link_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, struct dom_html_link_element *ele); /* Finalise a dom_html_link_element object */ -- cgit v1.2.3