mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 21:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-10-16 12:43:53 by bursa]

Browse Source 
Buffer css and scan in one piece to fix tokens split across blocks.

svn path=/import/netsurf/; revision=365
This commit is contained in:
James Bursa 2003-10-16 12:43:53 +00:00
parent 5e2fee7fd6
commit e33b401cb8
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
css/css.c
View File

@ -101,32 +101,37 @@ void css_create(struct content *c)
c->data.css.import_url = xcalloc(0, sizeof(*c->data.css.import_url)); 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->data.css.import_content = xcalloc(0, sizeof(*c->data.css.import_content));
c->active = 0; 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) 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;
}
int css_convert(struct content *c, unsigned int width, unsigned int height)
{ {
int token; int token;
YY_BUFFER_STATE buffer; YY_BUFFER_STATE buffer;
struct parse_params param = {0, c, 0}; struct parse_params param = {0, c, 0};
LOG(("content %p, size %lu", c, size)); c->data.css.data[c->data.css.length] =
c->data.css.data[c->data.css.length + 1] = 0;
buffer = css__scan_bytes(data, size, c->data.css.css->lexer); buffer = css__scan_buffer(c->data.css.data, c->data.css.length + 2,
c->data.css.css->lexer);
assert(buffer);
while ((token = css_lex(c->data.css.css->lexer))) { while ((token = css_lex(c->data.css.css->lexer))) {
css_parser_(c->data.css.css->parser, token, css_parser_(c->data.css.css->parser, token,
xstrdup(css_get_text(c->data.css.css->lexer)), xstrdup(css_get_text(c->data.css.css->lexer)),
&param); &param);
} }
css__delete_buffer(buffer, c->data.css.css->lexer); css__delete_buffer(buffer, c->data.css.css->lexer);
} free(c->data.css.data);
int css_convert(struct content *c, unsigned int width, unsigned int height)
{
struct parse_params param = {0, c, 0};
LOG(("content %p", c));
css_parser_(c->data.css.css->parser, 0, 0, &param); css_parser_(c->data.css.css->parser, 0, 0, &param);
@ -616,7 +621,7 @@ void css_dump_style(const struct css_style * const style)
} }
fprintf(stderr, "; "); fprintf(stderr, "; ");
fprintf(stderr, "text-align: %s; ", css_text_align_name[style->text_align]); fprintf(stderr, "text-align: %s; ", css_text_align_name[style->text_align]);
fprintf(stderr, "visibility: %s", css_visibility_name[style->visibility]); fprintf(stderr, "visibility: %s; ", css_visibility_name[style->visibility]);
fprintf(stderr, "width: "); fprintf(stderr, "width: ");
switch (style->width.width) { switch (style->width.width) {
case CSS_WIDTH_AUTO: fprintf(stderr, "auto"); break; case CSS_WIDTH_AUTO: fprintf(stderr, "auto"); break;
@ -635,7 +640,7 @@ void css_dump_stylesheet(const struct css_stylesheet * stylesheet)
unsigned int i; unsigned int i;
struct css_node *r, *n, *m; struct css_node *r, *n, *m;
for (i = 0; i != HASH_SIZE; i++) { for (i = 0; i != HASH_SIZE; i++) {
fprintf(stderr, "hash %i:\n", i); /*fprintf(stderr, "hash %i:\n", i);*/
for (r = stylesheet->rule[i]; r != 0; r = r->next) { for (r = stylesheet->rule[i]; r != 0; r = r->next) {
for (n = r; n != 0; n = n->right) { for (n = r; n != 0; n = n->right) {
if (n->data != 0) if (n->data != 0)

2
css/css.h
View File

@ -97,6 +97,8 @@ struct content_css_data {
unsigned int import_count; unsigned int import_count;
char **import_url; char **import_url;
struct content **import_content; struct content **import_content;
char *data;
unsigned int length;
}; };