diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-11-07 22:52:03 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-11-07 22:52:03 +0000 |
commit | 55c6841eca063e8fe4db0b8ac67c8a61da9b7312 (patch) | |
tree | 17e0ed1b1d0130404e15e73708903c3ed729a6b6 /render/html.c | |
parent | f37a8ad58be683bc42e7cff692c78797a580b921 (diff) | |
parent | 9482bb464a157265a555dfa38fcf2dc37ade12fd (diff) | |
download | netsurf-55c6841eca063e8fe4db0b8ac67c8a61da9b7312.tar.gz netsurf-55c6841eca063e8fe4db0b8ac67c8a61da9b7312.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/render/html.c b/render/html.c index 4e79e085e..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 @@ -464,6 +465,7 @@ parse_chunk_to_nserror(dom_hubbub_error error) case (DOM_HUBBUB_HUBBUB_ERR | HUBBUB_UNKNOWN): /* currently only generated by the libdom hubbub binding */ + return NSERROR_DOM; default: /* unknown error */ /** @todo better error handling and reporting */ @@ -2030,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"); |