summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--include/dom/dom.h1
-rw-r--r--include/dom/html/html_meta_element.h26
-rw-r--r--src/html/html_document.c1
-rw-r--r--src/html/html_document_strings.h5
-rw-r--r--src/html/html_meta_element.c57
-rw-r--r--src/html/html_meta_element.h2
-rw-r--r--test/testcases/tests/level1/html/HTMLMetaElement01.xml (renamed from test/testcases/tests/level1/html/HTMLMetaElement01.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLMetaElement02.xml (renamed from test/testcases/tests/level1/html/HTMLMetaElement02.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLMetaElement03.xml (renamed from test/testcases/tests/level1/html/HTMLMetaElement03.xml.kfail)0
-rw-r--r--test/testcases/tests/level1/html/HTMLMetaElement04.xml (renamed from test/testcases/tests/level1/html/HTMLMetaElement04.xml.kfail)0
11 files changed, 81 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index ff328e6..a66bee0 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_html_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_head_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_link_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_title_element.h
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_meta_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_form_element.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
diff --git a/include/dom/dom.h b/include/dom/dom.h
index 1c0e908..05ce3e6 100644
--- a/include/dom/dom.h
+++ b/include/dom/dom.h
@@ -45,6 +45,7 @@
#include <dom/html/html_head_element.h>
#include <dom/html/html_link_element.h>
#include <dom/html/html_title_element.h>
+#include <dom/html/html_meta_element.h>
#include <dom/html/html_form_element.h>
/* DOM Events header */
diff --git a/include/dom/html/html_meta_element.h b/include/dom/html/html_meta_element.h
index 8ceb459..b9898f1 100644
--- a/include/dom/html/html_meta_element.h
+++ b/include/dom/html/html_meta_element.h
@@ -8,7 +8,33 @@
#ifndef dom_html_meta_element_h_
#define dom_html_meta_element_h_
+#include <dom/core/string.h>
+
typedef struct dom_html_meta_element dom_html_meta_element;
+dom_exception dom_html_meta_element_get_content(dom_html_meta_element *ele,
+ dom_string **content);
+
+dom_exception dom_html_meta_element_set_content(dom_html_meta_element *ele,
+ dom_string *content);
+
+dom_exception dom_html_meta_element_get_http_equiv(dom_html_meta_element *ele,
+ dom_string **http_equiv);
+
+dom_exception dom_html_meta_element_set_http_equiv(dom_html_meta_element *ele,
+ dom_string *http_equiv);
+
+dom_exception dom_html_meta_element_get_name(dom_html_meta_element *ele,
+ dom_string **name);
+
+dom_exception dom_html_meta_element_set_name(dom_html_meta_element *ele,
+ dom_string *name);
+
+dom_exception dom_html_meta_element_get_scheme(dom_html_meta_element *ele,
+ dom_string **scheme);
+
+dom_exception dom_html_meta_element_set_scheme(dom_html_meta_element *ele,
+ dom_string *scheme);
+
#endif
diff --git a/src/html/html_document.c b/src/html/html_document.c
index ae36454..b266844 100644
--- a/src/html/html_document.c
+++ b/src/html/html_document.c
@@ -15,6 +15,7 @@
#include "html/html_head_element.h"
#include "html/html_link_element.h"
#include "html/html_title_element.h"
+#include "html/html_meta_element.h"
#include "html/html_form_element.h"
#include "core/string.h"
diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h
index b092c9e..632b686 100644
--- a/src/html/html_document_strings.h
+++ b/src/html/html_document_strings.h
@@ -45,6 +45,11 @@ HTML_DOCUMENT_STRINGS_ACTION1(rel)
HTML_DOCUMENT_STRINGS_ACTION1(rev)
HTML_DOCUMENT_STRINGS_ACTION1(target)
HTML_DOCUMENT_STRINGS_ACTION1(type)
+/* Useful attributes used by HTMLMetaElement */
+HTML_DOCUMENT_STRINGS_ACTION1(content)
+HTML_DOCUMENT_STRINGS_ACTION(http_equiv,http-equiv)
+HTML_DOCUMENT_STRINGS_ACTION1(name)
+HTML_DOCUMENT_STRINGS_ACTION1(scheme)
/* Useful attributes used by HTMLFormElement */
HTML_DOCUMENT_STRINGS_ACTION(accept_charset,accept-charset)
HTML_DOCUMENT_STRINGS_ACTION1(action)
diff --git a/src/html/html_meta_element.c b/src/html/html_meta_element.c
index f1b6c3f..9cc8067 100644
--- a/src/html/html_meta_element.c
+++ b/src/html/html_meta_element.c
@@ -7,6 +7,7 @@
#include <stdlib.h>
+#include "html/html_document.h"
#include "html/html_meta_element.h"
#include "core/node.h"
@@ -27,6 +28,7 @@ static struct dom_element_protected_vtable _protect_vtable = {
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
dom_exception _dom_html_meta_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_meta_element **ele)
{
struct dom_node_internal *node;
@@ -40,7 +42,7 @@ dom_exception _dom_html_meta_element_create(struct dom_html_document *doc,
node->base.vtable = &_dom_element_vtable;
node->vtable = &_protect_vtable;
- return _dom_html_meta_element_initialise(doc, *ele);
+ return _dom_html_meta_element_initialise(doc, namespace, prefix, *ele);
}
/**
@@ -51,19 +53,12 @@ dom_exception _dom_html_meta_element_create(struct dom_html_document *doc,
* \return DOM_NO_ERR on success, appropriate dom_exception on failure.
*/
dom_exception _dom_html_meta_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_meta_element *ele)
{
- dom_string *name = NULL;
- dom_exception err;
-
- err = dom_string_create((const uint8_t *) "META", SLEN("META"), &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_META],
+ namespace, prefix);
}
/**
@@ -118,3 +113,41 @@ dom_exception _dom_html_meta_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_meta_element_get_##fattr(dom_html_meta_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_meta_element_set_##fattr(dom_html_meta_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(content,content)
+SIMPLE_GET_SET(http_equiv,http_equiv)
+SIMPLE_GET_SET(name,name)
+SIMPLE_GET_SET(scheme,scheme)
diff --git a/src/html/html_meta_element.h b/src/html/html_meta_element.h
index d302d24..d4a1076 100644
--- a/src/html/html_meta_element.h
+++ b/src/html/html_meta_element.h
@@ -19,10 +19,12 @@ struct dom_html_meta_element {
/* Create a dom_html_meta_element object */
dom_exception _dom_html_meta_element_create(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_meta_element **ele);
/* Initialise a dom_html_meta_element object */
dom_exception _dom_html_meta_element_initialise(struct dom_html_document *doc,
+ dom_string *namespace, dom_string *prefix,
struct dom_html_meta_element *ele);
/* Finalise a dom_html_meta_element object */
diff --git a/test/testcases/tests/level1/html/HTMLMetaElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLMetaElement01.xml
index 5ee3bcc..5ee3bcc 100644
--- a/test/testcases/tests/level1/html/HTMLMetaElement01.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLMetaElement01.xml
diff --git a/test/testcases/tests/level1/html/HTMLMetaElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLMetaElement02.xml
index 11e7a09..11e7a09 100644
--- a/test/testcases/tests/level1/html/HTMLMetaElement02.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLMetaElement02.xml
diff --git a/test/testcases/tests/level1/html/HTMLMetaElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLMetaElement03.xml
index ab3afc7..ab3afc7 100644
--- a/test/testcases/tests/level1/html/HTMLMetaElement03.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLMetaElement03.xml
diff --git a/test/testcases/tests/level1/html/HTMLMetaElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLMetaElement04.xml
index 14ce0eb..14ce0eb 100644
--- a/test/testcases/tests/level1/html/HTMLMetaElement04.xml.kfail
+++ b/test/testcases/tests/level1/html/HTMLMetaElement04.xml
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 14:36:54 +0000