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

[project @ 2004-06-02 21:09:14 by bursa]

Browse Source 
Update calls to layout_document() for error handling.

svn path=/import/netsurf/; revision=915
This commit is contained in:
James Bursa 2004-06-02 21:09:14 +00:00
parent ef8e27a458
commit ed4c1ad391
5 changed files with 213 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
render/font.h
View File

@ -6,8 +6,8 @@
* Copyright 2003 James Bursa <bursa@users.sourceforge.net> * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
*/ */
#ifndef _NETSURF_RISCOS_FONT_H_ #ifndef _NETSURF_RENDER_FONT_H_
#define _NETSURF_RISCOS_FONT_H_ #define _NETSURF_RENDER_FONT_H_
#include "netsurf/css/css.h" #include "netsurf/css/css.h"

40
render/form.c
View File

@ -135,10 +135,10 @@ struct form_successful_control *form_successful_controls(struct form *form,
for (option = control->data.select.items; option; for (option = control->data.select.items; option;
option = option->next) { option = option->next) {
if (option->selected) { if (option->selected) {
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = false; success_new->file = false;
success_new->name = xstrdup(control->name); success_new->name = strdup(control->name);
success_new->value = xstrdup(option->value); success_new->value = strdup(option->value);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
last_success = success_new; last_success = success_new;
@ -149,9 +149,9 @@ struct form_successful_control *form_successful_controls(struct form *form,
/* textarea */ /* textarea */
if (control->type == GADGET_TEXTAREA) { if (control->type == GADGET_TEXTAREA) {
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = false; success_new->file = false;
success_new->name = xstrdup(control->name); success_new->name = strdup(control->name);
success_new->value = form_textarea_value(control); success_new->value = form_textarea_value(control);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
@ -163,21 +163,21 @@ struct form_successful_control *form_successful_controls(struct form *form,
if (control->type == GADGET_IMAGE) { if (control->type == GADGET_IMAGE) {
unsigned int len = strlen(control->name) + 3; unsigned int len = strlen(control->name) + 3;
/* x */ /* x */
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = false; success_new->file = false;
success_new->name = xcalloc(1, len); success_new->name = calloc(1, len);
sprintf(success_new->name, "%s.x", control->name); sprintf(success_new->name, "%s.x", control->name);
success_new->value = xcalloc(1, 20); success_new->value = calloc(1, 20);
sprintf(success_new->value, "%i", control->data.image.mx); sprintf(success_new->value, "%i", control->data.image.mx);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
last_success = success_new; last_success = success_new;
/* y */ /* y */
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = false; success_new->file = false;
success_new->name = xcalloc(1, len); success_new->name = calloc(1, len);
sprintf(success_new->name, "%s.y", control->name); sprintf(success_new->name, "%s.y", control->name);
success_new->value = xcalloc(1, 20); success_new->value = calloc(1, 20);
sprintf(success_new->value, "%i", control->data.image.my); sprintf(success_new->value, "%i", control->data.image.my);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
@ -190,10 +190,10 @@ struct form_successful_control *form_successful_controls(struct form *form,
/* file */ /* file */
if (control->type == GADGET_FILE && control->value) { if (control->type == GADGET_FILE && control->value) {
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = true; success_new->file = true;
success_new->name = xstrdup(control->name); success_new->name = strdup(control->name);
success_new->value = xstrdup(control->value); success_new->value = strdup(control->value);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
last_success = success_new; last_success = success_new;
@ -202,10 +202,10 @@ struct form_successful_control *form_successful_controls(struct form *form,
/* all others added if they have a value */ /* all others added if they have a value */
if (control->value) { if (control->value) {
success_new = xcalloc(1, sizeof(*success_new)); success_new = calloc(1, sizeof(*success_new));
success_new->file = false; success_new->file = false;
success_new->name = xstrdup(control->name); success_new->name = strdup(control->name);
success_new->value = xstrdup(control->value); success_new->value = strdup(control->value);
success_new->next = 0; success_new->next = 0;
last_success->next = success_new; last_success->next = success_new;
last_success = success_new; last_success = success_new;
@ -239,7 +239,7 @@ char *form_textarea_value(struct form_control *textarea)
} }
/* construct value */ /* construct value */
s = value = xcalloc(1, len); s = value = calloc(1, len);
for (inline_container = textarea->box->children; for (inline_container = textarea->box->children;
inline_container; inline_container;
inline_container = inline_container->next) { inline_container = inline_container->next) {
@ -265,14 +265,14 @@ char *form_textarea_value(struct form_control *textarea)
char *form_url_encode(struct form_successful_control *control) char *form_url_encode(struct form_successful_control *control)
{ {
char *s = xcalloc(1, 0); char *s = calloc(1, 0);
unsigned int len = 0, len1; unsigned int len = 0, len1;
for (; control; control = control->next) { for (; control; control = control->next) {
char *name = curl_escape(control->name, 0); char *name = curl_escape(control->name, 0);
char *value = curl_escape(control->value, 0); char *value = curl_escape(control->value, 0);
len1 = len + strlen(name) + strlen(value) + 2; len1 = len + strlen(name) + strlen(value) + 2;
s = xrealloc(s, len1 + 1); s = realloc(s, len1 + 1);
sprintf(s + len, "%s=%s&", name, value); sprintf(s + len, "%s=%s&", name, value);
len = len1; len = len1;
curl_free(name); curl_free(name);

11
render/html.c
View File

@ -201,7 +201,8 @@ int html_convert(struct content *c, unsigned int width, unsigned int height)
sprintf(c->status_message, messages_get("Formatting")); sprintf(c->status_message, messages_get("Formatting"));
content_broadcast(c, CONTENT_MSG_STATUS, data); content_broadcast(c, CONTENT_MSG_STATUS, data);
LOG(("Layout document")); LOG(("Layout document"));
layout_document(c->data.html.layout->children, width); layout_document(c->data.html.layout->children, width,
c->data.html.box_pool);
/*box_dump(c->data.html.layout->children, 0);*/ /*box_dump(c->data.html.layout->children, 0);*/
c->width = c->data.html.layout->children->width; c->width = c->data.html.layout->children->width;
@ -284,7 +285,7 @@ void html_find_stylesheets(struct content *c, xmlNode *head)
c->data.html.stylesheet_content[0] = fetchcache( c->data.html.stylesheet_content[0] = fetchcache(
#ifdef riscos #ifdef riscos
"file:///%3CNetSurf$Dir%3E/Resources/CSS", "file:/<NetSurf$Dir>/Resources/CSS",
#else #else
"file:///home/james/Projects/netsurf/CSS", "file:///home/james/Projects/netsurf/CSS",
#endif #endif
@ -768,7 +769,8 @@ void html_revive(struct content *c, unsigned int width, unsigned int height)
} }
} }
layout_document(c->data.html.layout->children, width); layout_document(c->data.html.layout->children, width,
c->data.html.box_pool);
c->width = c->data.html.layout->children->width; c->width = c->data.html.layout->children->width;
c->height = c->data.html.layout->children->height; c->height = c->data.html.layout->children->height;
@ -783,7 +785,8 @@ void html_revive(struct content *c, unsigned int width, unsigned int height)
void html_reformat(struct content *c, unsigned int width, unsigned int height) void html_reformat(struct content *c, unsigned int width, unsigned int height)
{ {
layout_document(c->data.html.layout->children, width); layout_document(c->data.html.layout->children, width,
c->data.html.box_pool);
c->width = c->data.html.layout->children->width; c->width = c->data.html.layout->children->width;
c->height = c->data.html.layout->children->height; c->height = c->data.html.layout->children->height;
} }

265
render/layout.c
View File

@ -32,10 +32,12 @@
#include "netsurf/render/layout.h" #include "netsurf/render/layout.h"
#define NDEBUG #define NDEBUG
#include "netsurf/utils/log.h" #include "netsurf/utils/log.h"
#include "netsurf/utils/pool.h"
#include "netsurf/utils/utils.h" #include "netsurf/utils/utils.h"
#define AUTO INT_MIN #define AUTO INT_MIN
#define ERROR_OUT_OF_MEMORY 1
static void layout_block_find_dimensions(int available_width, struct box *box); static void layout_block_find_dimensions(int available_width, struct box *box);
@ -49,38 +51,42 @@ static void layout_find_dimensions(int available_width,
static int layout_clear(struct box *fl, css_clear clear); static int layout_clear(struct box *fl, css_clear clear);
static void find_sides(struct box *fl, int y0, int y1, static void find_sides(struct box *fl, int y0, int y1,
int *x0, int *x1, struct box **left, struct box **right); int *x0, int *x1, struct box **left, struct box **right);
static void layout_inline_container(struct box *box, int width, static bool layout_inline_container(struct box *box, int width,
struct box *cont, int cx, int cy); struct box *cont, int cx, int cy, pool box_pool);
static int line_height(struct css_style *style); static int line_height(struct css_style *style);
static struct box * layout_line(struct box *first, int width, int *y, static bool layout_line(struct box *first, int width, int *y,
int cx, int cy, struct box *cont, bool indent); int cx, int cy, struct box *cont, bool indent,
pool box_pool, struct box **next_box);
static int layout_text_indent(struct css_style *style, int width); static int layout_text_indent(struct css_style *style, int width);
static void layout_float(struct box *b, int width); static bool layout_float(struct box *b, int width, pool box_pool);
static void place_float_below(struct box *c, int width, int cx, int y, static void place_float_below(struct box *c, int width, int cx, int y,
struct box *cont); struct box *cont);
static void layout_table(struct box *box, int available_width); static bool layout_table(struct box *box, int available_width, pool box_pool);
static void calculate_widths(struct box *box); static bool calculate_widths(struct box *box);
static void calculate_block_widths(struct box *box, int *min, int *max, static bool calculate_block_widths(struct box *box, int *min, int *max,
int *max_sum); int *max_sum);
static void calculate_inline_container_widths(struct box *box); static bool calculate_inline_container_widths(struct box *box);
static void calculate_inline_replaced_widths(struct box *box, int *min, static void calculate_inline_replaced_widths(struct box *box, int *min,
int *max, int *line_max); int *max, int *line_max);
static void calculate_inline_widths(struct box *box, int *min, int *line_max); static void calculate_inline_widths(struct box *box, int *min, int *line_max);
static void calculate_table_widths(struct box *table); static bool calculate_table_widths(struct box *table);
/** /**
* Calculate positions of boxes in a document. * Calculate positions of boxes in a document.
* *
* \param doc root of document box tree * \param doc root of document box tree
* \param width available page width * \param width available page width
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
*/ */
void layout_document(struct box *doc, int width) bool layout_document(struct box *doc, int width, pool box_pool)
{ {
doc->float_children = 0; doc->float_children = 0;
calculate_widths(doc); if (!calculate_widths(doc))
return false;
layout_block_find_dimensions(width, doc); layout_block_find_dimensions(width, doc);
doc->x = doc->margin[LEFT] + doc->border[LEFT]; doc->x = doc->margin[LEFT] + doc->border[LEFT];
@ -88,7 +94,7 @@ void layout_document(struct box *doc, int width)
width -= doc->margin[LEFT] + doc->border[LEFT] + width -= doc->margin[LEFT] + doc->border[LEFT] +
doc->border[RIGHT] + doc->margin[RIGHT]; doc->border[RIGHT] + doc->margin[RIGHT];
doc->width = width; doc->width = width;
layout_block_context(doc); return layout_block_context(doc, box_pool);
} }
@ -96,12 +102,14 @@ void layout_document(struct box *doc, int width)
* Layout a block formatting context. * Layout a block formatting context.
* *
* \param block BLOCK, INLINE_BLOCK, or TABLE_CELL to layout. * \param block BLOCK, INLINE_BLOCK, or TABLE_CELL to layout.
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
* *
* This function carries out layout of a block and its children, as described * This function carries out layout of a block and its children, as described
* in CSS 2.1 9.4.1. * in CSS 2.1 9.4.1.
*/ */
void layout_block_context(struct box *block) bool layout_block_context(struct box *block, pool box_pool)
{ {
struct box *box; struct box *box;
int cx; int cx;
@ -139,7 +147,8 @@ void layout_block_context(struct box *block)
if (box->type == BOX_BLOCK) if (box->type == BOX_BLOCK)
layout_block_find_dimensions(box->parent->width, box); layout_block_find_dimensions(box->parent->width, box);
else if (box->type == BOX_TABLE) { else if (box->type == BOX_TABLE) {
layout_table(box, box->parent->width); if (!layout_table(box, box->parent->width, box_pool))
return false;
layout_solve_width(box->parent->width, box->width, layout_solve_width(box->parent->width, box->width,
box->margin, box->padding, box->border); box->margin, box->padding, box->border);
} }
@ -178,7 +187,9 @@ void layout_block_context(struct box *block)
/* Layout (except tables). */ /* Layout (except tables). */
if (box->type == BOX_INLINE_CONTAINER) { if (box->type == BOX_INLINE_CONTAINER) {
box->width = box->parent->width; box->width = box->parent->width;
layout_inline_container(box, box->width, block, cx, cy); if (!layout_inline_container(box, box->width, block,
cx, cy, box_pool))
return false;
} else if (box->type == BOX_TABLE) { } else if (box->type == BOX_TABLE) {
/* Move down to avoid floats if necessary. */ /* Move down to avoid floats if necessary. */
int x0, x1; int x0, x1;
@ -267,6 +278,8 @@ void layout_block_context(struct box *block)
if (block->height == AUTO) if (block->height == AUTO)
block->height = cy - block->padding[TOP]; block->height = cy - block->padding[TOP];
return true;
} }
@ -579,13 +592,15 @@ void find_sides(struct box *fl, int y0, int y1,
* \param cont ancestor box which defines horizontal space, for floats * \param cont ancestor box which defines horizontal space, for floats
* \param cx box position relative to cont * \param cx box position relative to cont
* \param cy box position relative to cont * \param cy box position relative to cont
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
*/ */
void layout_inline_container(struct box *box, int width, bool layout_inline_container(struct box *box, int width,
struct box *cont, int cx, int cy) struct box *cont, int cx, int cy, pool box_pool)
{ {
bool first_line = true; bool first_line = true;
struct box *c; struct box *c, *next;
int y = 0; int y = 0;
assert(box->type == BOX_INLINE_CONTAINER); assert(box->type == BOX_INLINE_CONTAINER);
@ -595,12 +610,17 @@ void layout_inline_container(struct box *box, int width,
for (c = box->children; c; ) { for (c = box->children; c; ) {
LOG(("c %p", c)); LOG(("c %p", c));
c = layout_line(c, width, &y, cx, cy + y, cont, first_line); if (!layout_line(c, width, &y, cx, cy + y, cont, first_line,
box_pool, &next))
return false;
c = next;
first_line = false; first_line = false;
} }
box->width = width; box->width = width;
box->height = y; box->height = y;
return true;
} }
@ -647,10 +667,14 @@ int line_height(struct css_style *style)
* \param cy coordinate of top of line relative to cont * \param cy coordinate of top of line relative to cont
* \param cont ancestor box which defines horizontal space, for floats * \param cont ancestor box which defines horizontal space, for floats
* \param indent apply any first-line indent * \param indent apply any first-line indent
* \param next_box updated to first box for next line, or 0 at end
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
*/ */
struct box * layout_line(struct box *first, int width, int *y, bool layout_line(struct box *first, int width, int *y,
int cx, int cy, struct box *cont, bool indent) int cx, int cy, struct box *cont, bool indent,
pool box_pool, struct box **next_box)
{ {
int height, used_height; int height, used_height;
int x0 = 0; int x0 = 0;
@ -687,7 +711,8 @@ struct box * layout_line(struct box *first, int width, int *y,
if (b->type == BOX_INLINE_BLOCK) { if (b->type == BOX_INLINE_BLOCK) {
if (b->width == UNKNOWN_WIDTH) if (b->width == UNKNOWN_WIDTH)
layout_float(b, width); if (!layout_float(b, width, box_pool))
return false;
/** \todo should margin be included? spec unclear */ /** \todo should margin be included? spec unclear */
h = b->border[TOP] + b->padding[TOP] + b->height + h = b->border[TOP] + b->padding[TOP] + b->height +
b->padding[BOTTOM] + b->border[BOTTOM]; b->padding[BOTTOM] + b->border[BOTTOM];
@ -756,23 +781,32 @@ struct box * layout_line(struct box *first, int width, int *y,
break; break;
} }
if (b->width == AUTO && b->height == AUTO) { if (b->object) {
b->width = b->object->width; if (b->width == AUTO && b->height == AUTO) {
b->height = b->object->height;
} else if (b->width == AUTO) {
if (b->object->height)
b->width = b->object->width *
(float) b->height /
b->object->height;
else
b->width = b->object->width; b->width = b->object->width;
} else if (b->height == AUTO) {
if (b->object->width)
b->height = b->object->height *
(float) b->width /
b->object->width;
else
b->height = b->object->height; b->height = b->object->height;
} else if (b->width == AUTO) {
if (b->object->height)
b->width = b->object->width *
(float) b->height /
b->object->height;
else
b->width = b->object->width;
} else if (b->height == AUTO) {
if (b->object->width)
b->height = b->object->height *
(float) b->width /
b->object->width;
else
b->height = b->object->height;
}
} else {
/* form control with no object */
if (b->width == AUTO)
b->width = 0;
if (b->height == AUTO)
b->height = line_height(b->style ? b->style :
b->parent->parent->style);
} }
if (b->object && b->object->type == CONTENT_HTML && if (b->object && b->object->type == CONTENT_HTML &&
@ -843,7 +877,8 @@ struct box * layout_line(struct box *first, int width, int *y,
d->float_children = 0; d->float_children = 0;
/* css_dump_style(b->style); */ /* css_dump_style(b->style); */
layout_float(d, width); if (!layout_float(d, width, box_pool))
return false;
d->x = d->margin[LEFT] + d->border[LEFT]; d->x = d->margin[LEFT] + d->border[LEFT];
d->y = d->margin[TOP] + d->border[TOP]; d->y = d->margin[TOP] + d->border[TOP];
b->width = d->margin[LEFT] + d->border[LEFT] + b->width = d->margin[LEFT] + d->border[LEFT] +
@ -920,9 +955,13 @@ struct box * layout_line(struct box *first, int width, int *y,
} else { } else {
/* cut off first word for this line */ /* cut off first word for this line */
/* \todo allocate from box_pool */ /* \todo allocate from box_pool */
c2 = memcpy(xcalloc(1, sizeof (struct box)), c2 = pool_alloc(box_pool, sizeof *c2);
split_box, sizeof (struct box)); if (!c2)
c2->text = xstrdup(split_box->text + space + 1); return false;
memcpy(c2, split_box, sizeof *c2);
c2->text = strdup(split_box->text + space + 1);
if (!c2->text)
return false;
c2->length = split_box->length - (space + 1); c2->length = split_box->length - (space + 1);
c2->width = UNKNOWN_WIDTH; c2->width = UNKNOWN_WIDTH;
c2->clone = 1; c2->clone = 1;
@ -958,9 +997,13 @@ struct box * layout_line(struct box *first, int width, int *y,
if (space == 0) if (space == 0)
space = 1; space = 1;
/* \todo use box pool */ /* \todo use box pool */
c2 = memcpy(xcalloc(1, sizeof (struct box)), split_box, c2 = pool_alloc(box_pool, sizeof *c2);
sizeof (struct box)); if (!c2)
c2->text = xstrdup(split_box->text + space + 1); return false;
memcpy(c2, split_box, sizeof *c2);
c2->text = strdup(split_box->text + space + 1);
if (!c2->text)
return false;
c2->length = split_box->length - (space + 1); c2->length = split_box->length - (space + 1);
c2->width = UNKNOWN_WIDTH; c2->width = UNKNOWN_WIDTH;
c2->clone = 1; c2->clone = 1;
@ -1002,7 +1045,8 @@ struct box * layout_line(struct box *first, int width, int *y,
assert(b != first || (move_y && 0 < used_height && (left || right))); assert(b != first || (move_y && 0 < used_height && (left || right)));
if (move_y) *y += used_height; if (move_y) *y += used_height;
return b; *next_box = b;
return true;
} }
@ -1032,19 +1076,23 @@ int layout_text_indent(struct css_style *style, int width)
* *
* \param b float or inline block box * \param b float or inline block box
* \param width available width * \param width available width
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
*/ */
void layout_float(struct box *b, int width) bool layout_float(struct box *b, int width, pool box_pool)
{ {
layout_float_find_dimensions(width, b->style, b); layout_float_find_dimensions(width, b->style, b);
if (b->type == BOX_TABLE) { if (b->type == BOX_TABLE) {
layout_table(b, width); if (!layout_table(b, width, box_pool))
return false;
if (b->margin[LEFT] == AUTO) if (b->margin[LEFT] == AUTO)
b->margin[LEFT] = 0; b->margin[LEFT] = 0;
if (b->margin[RIGHT] == AUTO) if (b->margin[RIGHT] == AUTO)
b->margin[RIGHT] = 0; b->margin[RIGHT] = 0;
} else } else
layout_block_context(b); return layout_block_context(b, box_pool);
return true;
} }
@ -1090,9 +1138,13 @@ void place_float_below(struct box *c, int width, int cx, int y,
/** /**
* Layout a table. * Layout a table.
*
* \param box_pool memory pool for any new boxes
* \return true on success, false on memory exhaustion
*/ */
void layout_table(struct box *table, int available_width) bool layout_table(struct box *table, int available_width,
pool box_pool)
{ {
unsigned int columns = table->columns; /* total columns */ unsigned int columns = table->columns; /* total columns */
unsigned int i; unsigned int i;
@ -1110,7 +1162,7 @@ void layout_table(struct box *table, int available_width)
struct box *row; struct box *row;
struct box *row_group; struct box *row_group;
struct box **row_span_cell; struct box **row_span_cell;
struct column *col = alloca(columns * sizeof(struct column)); struct column *col;
struct css_style *style = table->style; struct css_style *style = table->style;
assert(table->type == BOX_TABLE); assert(table->type == BOX_TABLE);
@ -1118,6 +1170,20 @@ void layout_table(struct box *table, int available_width)
assert(table->children && table->children->children); assert(table->children && table->children->children);
assert(columns); assert(columns);
col = malloc(columns * sizeof col[0]);
excess_y = malloc(columns * sizeof excess_y[0]);
row_span = malloc(columns * sizeof row_span[0]);
row_span_cell = malloc(columns * sizeof row_span_cell[0]);
xs = malloc((columns + 1) * sizeof xs[0]);
if (!col || !xs || !row_span || !excess_y || !row_span_cell) {
free(col);
free(excess_y);
free(row_span);
free(row_span_cell);
free(xs);
return false;
}
memcpy(col, table->col, sizeof(col[0]) * columns); memcpy(col, table->col, sizeof(col[0]) * columns);
layout_find_dimensions(available_width, style, table->margin, layout_find_dimensions(available_width, style, table->margin,
@ -1261,10 +1327,6 @@ void layout_table(struct box *table, int available_width)
table_width = auto_width; table_width = auto_width;
} }
xs = xcalloc(columns + 1, sizeof(*xs));
row_span = xcalloc(columns, sizeof(row_span[0]));
excess_y = xcalloc(columns, sizeof(excess_y[0]));
row_span_cell = xcalloc(columns, sizeof(row_span_cell[0]));
xs[0] = x = 0; xs[0] = x = 0;
for (i = 0; i != columns; i++) { for (i = 0; i != columns; i++) {
x += col[i].width; x += col[i].width;
@ -1285,7 +1347,14 @@ void layout_table(struct box *table, int available_width)
c->float_children = 0; c->float_children = 0;
c->height = AUTO; c->height = AUTO;
layout_block_context(c); if (!layout_block_context(c, box_pool)) {
free(col);
free(excess_y);
free(row_span);
free(row_span_cell);
free(xs);
return false;
}
if (c->style->height.height == CSS_HEIGHT_LENGTH) { if (c->style->height.height == CSS_HEIGHT_LENGTH) {
/* some sites use height="1" or similar to attempt /* some sites use height="1" or similar to attempt
* to make cells as small as possible, so treat * to make cells as small as possible, so treat
@ -1342,13 +1411,16 @@ void layout_table(struct box *table, int available_width)
table_height += row_group_height; table_height += row_group_height;
} }
xfree(row_span_cell); free(col);
xfree(excess_y); free(excess_y);
xfree(row_span); free(row_span);
xfree(xs); free(row_span_cell);
free(xs);
table->width = table_width; table->width = table_width;
table->height = table_height; table->height = table_height;
return true;
} }
@ -1356,11 +1428,12 @@ void layout_table(struct box *table, int available_width)
* Find min, max widths required by boxes. * Find min, max widths required by boxes.
* *
* \param box top of tree of boxes * \param box top of tree of boxes
* \return true on success, false on memory exhaustion
* *
* The min_width and max_width fields of each box in the tree are computed. * The min_width and max_width fields of each box in the tree are computed.
*/ */
void calculate_widths(struct box *box) bool calculate_widths(struct box *box)
{ {
struct box *child; struct box *child;
int min = 0, max = 0, extra_fixed = 0; int min = 0, max = 0, extra_fixed = 0;
@ -1374,17 +1447,20 @@ void calculate_widths(struct box *box)
/* check if the widths have already been calculated */ /* check if the widths have already been calculated */
if (box->max_width != UNKNOWN_MAX_WIDTH) if (box->max_width != UNKNOWN_MAX_WIDTH)
return; return true;
for (child = box->children; child != 0; child = child->next) { for (child = box->children; child != 0; child = child->next) {
switch (child->type) { switch (child->type) {
case BOX_BLOCK: case BOX_BLOCK:
case BOX_TABLE: case BOX_TABLE:
calculate_block_widths(child, &min, &max, 0); if (!calculate_block_widths(child, &min, &max,
0))
return false;
break; break;
case BOX_INLINE_CONTAINER: case BOX_INLINE_CONTAINER:
calculate_inline_container_widths(child); if (!calculate_inline_container_widths(child))
return false;
if (min < child->min_width) if (min < child->min_width)
min = child->min_width; min = child->min_width;
if (max < child->max_width) if (max < child->max_width)
@ -1422,6 +1498,8 @@ void calculate_widths(struct box *box)
box->min_width = (min + extra_fixed) / (1.0 - extra_frac); box->min_width = (min + extra_fixed) / (1.0 - extra_frac);
box->max_width = (max + extra_fixed) / (1.0 - extra_frac); box->max_width = (max + extra_fixed) / (1.0 - extra_frac);
return true;
} }
@ -1433,17 +1511,21 @@ void calculate_widths(struct box *box)
* \param min current min, updated to new min * \param min current min, updated to new min
* \param max current max, updated to new max * \param max current max, updated to new max
* \param max_sum sum of maximum widths, updated, or 0 if not required * \param max_sum sum of maximum widths, updated, or 0 if not required
* \return true on success, false on memory exhaustion
*/ */
void calculate_block_widths(struct box *box, int *min, int *max, bool calculate_block_widths(struct box *box, int *min, int *max,
int *max_sum) int *max_sum)
{ {
int width; int width;
if (box->type == BOX_TABLE) if (box->type == BOX_TABLE) {
calculate_table_widths(box); if (!calculate_table_widths(box))
else return false;
calculate_widths(box); } else {
if (!calculate_widths(box))
return false;
}
if (box->style->width.width == CSS_WIDTH_LENGTH) { if (box->style->width.width == CSS_WIDTH_LENGTH) {
width = len(&box->style->width.value.length, box->style); width = len(&box->style->width.value.length, box->style);
@ -1466,6 +1548,8 @@ void calculate_block_widths(struct box *box, int *min, int *max,
if (*max < box->max_width) *max = box->max_width; if (*max < box->max_width) *max = box->max_width;
if (max_sum) *max_sum += box->max_width; if (max_sum) *max_sum += box->max_width;
} }
return true;
} }
@ -1473,7 +1557,7 @@ void calculate_block_widths(struct box *box, int *min, int *max,
* Find min, max width for an inline container. * Find min, max width for an inline container.
*/ */
void calculate_inline_container_widths(struct box *box) bool calculate_inline_container_widths(struct box *box)
{ {
struct box *child; struct box *child;
int min = 0, max = 0, line_max = 0; int min = 0, max = 0, line_max = 0;
@ -1481,7 +1565,7 @@ void calculate_inline_container_widths(struct box *box)
for (child = box->children; child != 0; child = child->next) { for (child = box->children; child != 0; child = child->next) {
switch (child->type) { switch (child->type) {
case BOX_INLINE: case BOX_INLINE:
if (child->object || child->gadget) if (child->object)
calculate_inline_replaced_widths(child, calculate_inline_replaced_widths(child,
&min, &max, &line_max); &min, &max, &line_max);
else if (child->text) else if (child->text)
@ -1490,14 +1574,16 @@ void calculate_inline_container_widths(struct box *box)
break; break;
case BOX_INLINE_BLOCK: case BOX_INLINE_BLOCK:
calculate_block_widths(child, &min, &max, if (!calculate_block_widths(child, &min, &max,
&line_max); &line_max))
return false;
break; break;
case BOX_FLOAT_LEFT: case BOX_FLOAT_LEFT:
case BOX_FLOAT_RIGHT: case BOX_FLOAT_RIGHT:
calculate_block_widths(child->children, if (!calculate_block_widths(child->children,
&min, &max, 0); &min, &max, 0))
return false;
break; break;
case BOX_BR: case BOX_BR:
@ -1522,6 +1608,8 @@ void calculate_inline_container_widths(struct box *box)
assert(min <= max); assert(min <= max);
box->min_width = min; box->min_width = min;
box->max_width = max; box->max_width = max;
return true;
} }
@ -1583,18 +1671,20 @@ void calculate_inline_widths(struct box *box, int *min, int *line_max)
* Find min, max widths for a table and determine column width types. * Find min, max widths for a table and determine column width types.
* *
* \param table table box to calculate widths * \param table table box to calculate widths
* \return true on success, false on memory exhaustion
* *
* If table->max_width is not UNKNOWN_MAX_WIDTH, returns with no change to table. * If table->max_width is not UNKNOWN_MAX_WIDTH, returns with no change to
* table.
* *
* If table->col is 0, it is created and filled in completely. * If table->col is 0, it is created and filled in completely.
* *
* If table->col exists, the type and width fields are left unchanged, and the min * If table->col exists, the type and width fields are left unchanged, and the
* and max fields are updated. * min and max fields are updated.
* *
* table->min_width and table->max_width are set. * table->min_width and table->max_width are set.
*/ */
void calculate_table_widths(struct box *table) bool calculate_table_widths(struct box *table)
{ {
unsigned int i, j; unsigned int i, j;
struct box *row_group, *row, *cell; struct box *row_group, *row, *cell;
@ -1605,11 +1695,12 @@ void calculate_table_widths(struct box *table)
/* check if the widths have already been calculated */ /* check if the widths have already been calculated */
if (table->max_width != UNKNOWN_MAX_WIDTH) if (table->max_width != UNKNOWN_MAX_WIDTH)
return; return true;
if (!table->col) { if (!table->col) {
col = table->col = malloc(table->columns * sizeof *col); col = table->col = malloc(table->columns * sizeof *col);
assert(col); if (!col)
return false;
for (i = 0; i != table->columns; i++) for (i = 0; i != table->columns; i++)
col[i].type = COLUMN_WIDTH_UNKNOWN; col[i].type = COLUMN_WIDTH_UNKNOWN;
} }
@ -1632,7 +1723,8 @@ void calculate_table_widths(struct box *table)
if (cell->columns != 1) if (cell->columns != 1)
continue; continue;
calculate_widths(cell); if (!calculate_widths(cell))
return false;
i = cell->start_column; i = cell->start_column;
/* update column min, max widths /* update column min, max widths
@ -1682,7 +1774,8 @@ void calculate_table_widths(struct box *table)
if (cell->columns == 1) if (cell->columns == 1)
continue; continue;
calculate_widths(cell); if (!calculate_widths(cell))
return false;
i = cell->start_column; i = cell->start_column;
cell_min = cell->min_width; cell_min = cell->min_width;
@ -1750,4 +1843,6 @@ void calculate_table_widths(struct box *table)
table->max_width = max_width; table->max_width = max_width;
LOG(("min_width %i, max_width %i", min_width, max_width)); LOG(("min_width %i, max_width %i", min_width, max_width));
return true;
} }

6
render/layout.h
View File

@ -16,7 +16,9 @@
#ifndef _NETSURF_RENDER_LAYOUT_H_ #ifndef _NETSURF_RENDER_LAYOUT_H_
#define _NETSURF_RENDER_LAYOUT_H_ #define _NETSURF_RENDER_LAYOUT_H_
void layout_document(struct box *box, int width); #include "netsurf/utils/pool.h"
void layout_block_context(struct box *block);
bool layout_document(struct box *box, int width, pool box_pool);
bool layout_block_context(struct box *block, pool box_pool);
#endif #endif