From b2242ae0f01b9fa4d791c3c74ce2a6383c6d27b1 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 24 Mar 2004 20:10:03 +0000 Subject: [project @ 2004-03-24 20:10:03 by jmb] Remove need for XML parse tree to be kept in memory. The source document is now reparsed when saving complete. svn path=/import/netsurf/; revision=662 --- render/html.c | 8 ++------ render/html.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'render') diff --git a/render/html.c b/render/html.c index 7e3fb834c..e028e523d 100644 --- a/render/html.c +++ b/render/html.c @@ -69,7 +69,6 @@ void html_create(struct content *c, const char *params[]) } html->parser = htmlCreatePushParserCtxt(0, 0, "", 0, 0, html->encoding); - html->document = 0; html->base_url = xstrdup(c->url); html->layout = 0; html->background_colour = TRANSPARENT; @@ -140,7 +139,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) /* finish parsing */ htmlParseChunk(c->data.html.parser, "", 0, 1); - document = c->data.html.document = c->data.html.parser->myDoc; + document = c->data.html.parser->myDoc; /*xmlDebugDumpDocument(stderr, c->data.html.parser->myDoc);*/ htmlFreeParserCtxt(c->data.html.parser); c->data.html.parser = 0; @@ -182,7 +181,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) /*box_dump(c->data.html.layout->children, 0);*/ /* XML tree not required past this point */ - //xmlFreeDoc(document); + xmlFreeDoc(document); /* layout the box tree */ sprintf(c->status_message, messages_get("Formatting")); @@ -756,9 +755,6 @@ void html_destroy(struct content *c) if (c->data.html.parser) htmlFreeParserCtxt(c->data.html.parser); - if (c->data.html.document) - xmlFreeDoc(c->data.html.document); - free(c->data.html.base_url); if (c->data.html.layout) diff --git a/render/html.h b/render/html.h index 673e57317..d029a7554 100644 --- a/render/html.h +++ b/render/html.h @@ -36,7 +36,6 @@ struct box_position { /** Data specific to CONTENT_HTML. */ struct content_html_data { htmlParserCtxt *parser; /**< HTML parser context. */ - xmlDoc *document; /**< the XML document tree */ xmlCharEncoding encoding; /**< Encoding of source. */ bool getenc; /**< Need to get the encoding from the document, as server is broken. */ -- cgit v1.2.3