diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-08-05 14:28:10 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-08-05 14:28:10 +0100 |
commit | 7716143240429371e8f357ddc44d15d343759ae1 (patch) | |
tree | 8df5a2839bcfdf4d0f68f2df8ab3f112ea36bf1b /render/html.c | |
parent | 1e02eba1932b1fa2eff148ed6e9b58170a74189e (diff) | |
parent | f5891097cc955e05946f114a7e28b36f61faddf1 (diff) | |
download | netsurf-7716143240429371e8f357ddc44d15d343759ae1.tar.gz netsurf-7716143240429371e8f357ddc44d15d343759ae1.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/render/html.c b/render/html.c index 069f290ef..8526ca001 100644 --- a/render/html.c +++ b/render/html.c @@ -334,7 +334,8 @@ html_create_html_data(html_content *c, const http_parameter *params) /* Create the parser binding */ c->parser = dom_hubbub_parser_create(c->encoding, true, - nsoption_bool(enable_javascript), + nsoption_bool(enable_javascript), + &c->document, NULL, html_process_script, c); @@ -347,6 +348,7 @@ html_create_html_data(html_content *c, const http_parameter *params) c->parser = dom_hubbub_parser_create(c->encoding, true, nsoption_bool(enable_javascript), + &c->document, NULL, html_process_script, c); @@ -449,6 +451,7 @@ html_process_encoding_change(struct content *c, html->parser = dom_hubbub_parser_create(html->encoding, true, nsoption_bool(enable_javascript), + &html->document, NULL, html_process_script, html); @@ -468,6 +471,8 @@ html_process_encoding_change(struct content *c, html->parser = dom_hubbub_parser_create(html->encoding, true, nsoption_bool(enable_javascript), + &html->document, + NULL, html_process_script, html); @@ -1966,7 +1971,8 @@ html_begin_conversion(html_content *htmlc) union content_msg_data msg_data; /** @todo Improve processing of errors */ - msg_data.error = messages_get("NoMemory"); + LOG(("Parsing failed")); + msg_data.error = messages_get("ParsingFail"); content_broadcast(&htmlc->base, CONTENT_MSG_ERROR, msg_data); return false; @@ -1975,23 +1981,15 @@ html_begin_conversion(html_content *htmlc) /* complete script execution */ html_scripts_exec(htmlc); - htmlc->document = dom_hubbub_parser_get_document(htmlc->parser); - - if (htmlc->document == NULL) { - LOG(("Parsing failed")); - msg_data.error = messages_get("ParsingFail"); - content_broadcast(&htmlc->base, CONTENT_MSG_ERROR, msg_data); - return false; - } - + /* quirks mode */ exc = dom_document_get_quirks_mode(htmlc->document, &htmlc->quirks); if (exc != DOM_NO_ERR) { LOG(("error retrieving quirks")); + /** @todo should this be fatal to the conversion? */ } - LOG(("quirks set to %d", htmlc->quirks)); - + /* get encoding */ if (htmlc->encoding == NULL) { const char *encoding; encoding = dom_hubbub_parser_get_encoding(htmlc->parser, |