mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 14:59:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2005-11-06 11:00:33 by bursa]

Browse Source 
Fix crash when a frame contains floats.

svn path=/import/netsurf/; revision=1877
This commit is contained in:
James Bursa 2005-11-06 11:00:33 +00:00
parent 0605ba7c12
commit 04566797cd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
render/layout.c
View File

@ -93,8 +93,6 @@ bool layout_document(struct content *content, int width, int height)
assert(content->type == CONTENT_HTML); assert(content->type == CONTENT_HTML);
doc->float_children = 0;
layout_minmax_block(doc); layout_minmax_block(doc);
layout_block_find_dimensions(width, doc); layout_block_find_dimensions(width, doc);
@ -161,6 +159,8 @@ bool layout_block_context(struct box *block, struct content *content)
gui_multitask(); gui_multitask();
block->float_children = 0;
if (block->object) { if (block->object) {
if (block->object->type == CONTENT_HTML) { if (block->object->type == CONTENT_HTML) {
box = block->object->data.html.layout; box = block->object->data.html.layout;
@ -1285,6 +1285,7 @@ bool layout_line(struct box *first, int width, int *y,
} else { } else {
/* float */ /* float */
LOG(("float %p", b));
d = b->children; d = b->children;
d->float_children = 0; d->float_children = 0;
/* css_dump_style(b->style); */ /* css_dump_style(b->style); */
@ -1320,7 +1321,11 @@ bool layout_line(struct box *first, int width, int *y,
place_float_below(b, width, cx, cy + height + 1, cont); place_float_below(b, width, cx, cy + height + 1, cont);
/* fprintf(stderr, "layout_line: float doesn't fit %li %li\n", b->x, b->y); */ /* fprintf(stderr, "layout_line: float doesn't fit %li %li\n", b->x, b->y); */
} }
assert(cont->float_children != b); if (cont->float_children == b) {
LOG(("float %p already placed", b));
box_dump(cont, 0);
assert(0);
}
b->next_float = cont->float_children; b->next_float = cont->float_children;
cont->float_children = b; cont->float_children = b;
split_box = 0; split_box = 0;
@ -1370,7 +1375,6 @@ bool layout_line(struct box *first, int width, int *y,
b = split_box->next; b = split_box->next;
} else { } else {
/* cut off first word for this line */ /* cut off first word for this line */
/* \todo allocate from content */
c2 = talloc_memdup(content, split_box, c2 = talloc_memdup(content, split_box,
sizeof *c2); sizeof *c2);
if (!c2) if (!c2)