From 43fb761f450e463dbce7431d20606cf795daf04c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 7 Nov 2012 18:47:35 +0000 Subject: add document.body, head and documentElement getters add a dom utility file and use it --- render/html.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) (limited to 'render') diff --git a/render/html.c b/render/html.c index 58e7254ac..616ae7b2a 100644 --- a/render/html.c +++ b/render/html.c @@ -53,6 +53,7 @@ #include "utils/url.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "utils/domutils.h" #define CHUNK 4096 @@ -2031,46 +2032,7 @@ html_begin_conversion(html_content *htmlc) } dom_string_unref(node_name); - /* ensure the head element is found */ - exc = dom_node_get_first_child(html, &head); - if ((exc != DOM_NO_ERR) || (head == NULL)) { - head = NULL; - LOG(("head element not found")); - } else { - dom_node_type node_type; - dom_node *next_node; - - /* find first node thats a element */ - do { - exc = dom_node_get_node_type(head, &node_type); - - if ((exc != DOM_NO_ERR) || - (node_type == DOM_ELEMENT_NODE)) - break; - - exc = dom_node_get_next_sibling(head, &next_node); - dom_node_unref(head); - if (exc == DOM_NO_ERR) { - head = next_node; - } else { - head = NULL; - } - } while (head != NULL); - - if (head != NULL) { - exc = dom_node_get_node_name(head, &node_name); - if ((exc == DOM_NO_ERR) || (node_name != NULL)) { - if (!dom_string_caseless_lwc_isequal(node_name, - corestring_lwc_head)) { - dom_node_unref(head); - LOG(("head element not found")); - head = NULL; - } - dom_string_unref(node_name); - } - } - } - + head = find_first_named_dom_element(html, corestring_lwc_head); if (head != NULL) { if (html_head(htmlc, head) == false) { msg_data.error = messages_get("NoMemory"); -- cgit v1.2.3