summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-03-11 02:19:14 +0000
committerJames Bursa <james@netsurf-browser.org>2004-03-11 02:19:14 +0000
commitfba46de9cbe8778919f68a7d24e242c7ee3f1331 (patch)
tree8fb266a75da3b79c2a2285d0d9e6fb8b8e9d8f91 /css
parent24da56f25d8986484d2294d8ada3348acf12c0b1 (diff)
downloadnetsurf-fba46de9cbe8778919f68a7d24e242c7ee3f1331.tar.gz
netsurf-fba46de9cbe8778919f68a7d24e242c7ee3f1331.tar.bz2
[project @ 2004-03-11 02:19:13 by bursa]
Add source_data to content structure and remove equivalents from individual contents. svn path=/import/netsurf/; revision=606
Diffstat (limited to 'css')
-rw-r--r--css/css.c24
-rw-r--r--css/css.h4
2 files changed, 4 insertions, 24 deletions
diff --git a/css/css.c b/css/css.c
index ee125da19..3b8dbeee9 100644
--- a/css/css.c
+++ b/css/css.c
@@ -167,16 +167,6 @@ void css_create(struct content *c, const char *params[])
c->data.css.import_url = xcalloc(0, sizeof(*c->data.css.import_url));
c->data.css.import_content = xcalloc(0, sizeof(*c->data.css.import_content));
c->active = 0;
- c->data.css.data = xcalloc(0, 1);
- c->data.css.length = 0;
-}
-
-
-void css_process_data(struct content *c, char *data, unsigned long size)
-{
- c->data.css.data = xrealloc(c->data.css.data, c->data.css.length + size + 2);
- memcpy(c->data.css.data + c->data.css.length, data, size);
- c->data.css.length += size;
}
@@ -186,9 +176,10 @@ int css_convert(struct content *c, unsigned int width, unsigned int height)
YY_BUFFER_STATE buffer;
struct parse_params param = {0, c, 0, false};
- c->data.css.data[c->data.css.length] =
- c->data.css.data[c->data.css.length + 1] = 0;
- buffer = css__scan_buffer(c->data.css.data, c->data.css.length + 2,
+ c->source_data = xrealloc(c->source_data, c->source_size + 2);
+ c->source_data[c->source_size] = 0;
+ c->source_data[c->source_size + 1] = 0;
+ buffer = css__scan_buffer(c->source_data, c->source_size + 2,
c->data.css.css->lexer);
assert(buffer);
while ((token = css_lex(c->data.css.css->lexer))) {
@@ -250,18 +241,11 @@ void css_revive(struct content *c, unsigned int width, unsigned int height)
}
-void css_reformat(struct content *c, unsigned int width, unsigned int height)
-{
-}
-
-
void css_destroy(struct content *c)
{
unsigned int i;
struct css_node *r;
- xfree(c->data.css.data);
-
for (i = 0; i != HASH_SIZE; i++) {
for (r = c->data.css.css->rule[i]; r != 0; r = r->next)
xfree(r->style);
diff --git a/css/css.h b/css/css.h
index 0c5f6d899..0c1f65e6f 100644
--- a/css/css.h
+++ b/css/css.h
@@ -169,8 +169,6 @@ struct content_css_data {
unsigned int import_count; /**< Number of entries in import_url. */
char **import_url; /**< Imported stylesheet urls. */
struct content **import_content; /**< Imported stylesheet contents. */
- char *data; /**< Source data. */
- unsigned int length; /**< Current length of data. */
};
@@ -258,10 +256,8 @@ struct parse_params {
struct content;
void css_create(struct content *c, const char *params[]);
-void css_process_data(struct content *c, char *data, unsigned long size);
int css_convert(struct content *c, unsigned int width, unsigned int height);
void css_revive(struct content *c, unsigned int width, unsigned int height);
-void css_reformat(struct content *c, unsigned int width, unsigned int height);
void css_destroy(struct content *c);
#ifdef CSS_INTERNALS