mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allocate new styles for implied boxes using talloc instead of css_duplicate_style(). 

svn path=/trunk/netsurf/; revision=3112
This commit is contained in:
James Bursa 2006-12-08 22:17:45 +00:00
parent 7e252084a5
commit 246352fb97
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
render/box_normalise.c
View File

@ -22,6 +22,7 @@
#endif
#define NDEBUG
#include "netsurf/utils/log.h"
#include "netsurf/utils/talloc.h"
struct span_info {
@ -126,14 +127,14 @@ bool box_normalise_block(struct box *block, struct content *c)
case BOX_TABLE_ROW:
case BOX_TABLE_CELL:
/* insert implied table */
style = css_duplicate_style(block->style);
style = talloc_memdup(c, block->style, sizeof *style);
if (!style)
return false;
css_cascade(style, &css_blank_style);
table = box_create(style, block->href, block->target,
0, 0, c);
if (!table) {
css_free_style(style);
talloc_free(style);
return false;
}
table->type = BOX_TABLE;
@ -208,7 +209,7 @@ bool box_normalise_table(struct box *table, struct content * c)
case BOX_TABLE_CELL:
/* insert implied table row group */
assert(table->style != NULL);
style = css_duplicate_style(table->style);
style = talloc_memdup(c, table->style, sizeof *style);
if (!style) {
free(col_info.spans);
return false;
@ -218,7 +219,7 @@ bool box_normalise_table(struct box *table, struct content * c)
table->target, 0, 0, c);
if (!row_group) {
free(col_info.spans);
css_free_style(style);
talloc_free(style);
return false;
}
row_group->type = BOX_TABLE_ROW_GROUP;
@ -385,14 +386,15 @@ bool box_normalise_table_row_group(struct box *row_group,
case BOX_TABLE_CELL:
/* insert implied table row */
assert(row_group->style != NULL);
style = css_duplicate_style(row_group->style);
style = talloc_memdup(c, row_group->style,
sizeof *style);
if (!style)
return false;
css_cascade(style, &css_blank_style);
row = box_create(style, row_group->href,
row_group->target, 0, 0, c);
if (!row) {
css_free_style(style);
talloc_free(style);
return false;
}
row->type = BOX_TABLE_ROW;
@ -485,14 +487,14 @@ bool box_normalise_table_row(struct box *row,
case BOX_TABLE_ROW:
/* insert implied table cell */
assert(row->style != NULL);
style = css_duplicate_style(row->style);
style = talloc_memdup(c, row->style, sizeof *style);
if (!style)
return false;
css_cascade(style, &css_blank_style);
cell = box_create(style, row->href, row->target, 0, 0,
c);
if (!cell) {
css_free_style(style);
talloc_free(style);
return false;
}
cell->type = BOX_TABLE_CELL;