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

In switch statements add default branch for unknown enum values, with assert. 

svn path=/trunk/netsurf/; revision=10603
This commit is contained in:
Michael Drake 2010-07-06 21:09:20 +00:00
parent e08255f3ee
commit f6faa20a37
1 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
desktop/frames.c
View File

@ -300,23 +300,33 @@ void browser_window_recalculate_frameset(struct browser_window *bw) {
window = &bw->children[index];
switch (window->frame_width.unit) {
case FRAME_DIMENSION_PIXELS:
widths[col][row] = window->frame_width.value *
window->scale;
if (window->border) {
if (col != 0)
widths[col][row] += 1;
if (col != bw->cols - 1)
widths[col][row] += 1;
}
break;
case FRAME_DIMENSION_PERCENT:
widths[col][row] = bw_width * window->frame_width.value / 100;
break;
case FRAME_DIMENSION_RELATIVE:
widths[col][row] = 0;
relative += window->frame_width.value;
break;
case FRAME_DIMENSION_PIXELS:
widths[col][row] = window->frame_width.value *
window->scale;
if (window->border) {
if (col != 0)
widths[col][row] += 1;
if (col != bw->cols - 1)
widths[col][row] += 1;
}
break;
case FRAME_DIMENSION_PERCENT:
widths[col][row] = bw_width *
window->frame_width.value / 100;
break;
case FRAME_DIMENSION_RELATIVE:
widths[col][row] = 0;
relative += window->frame_width.value;
break;
default:
/* unknown frame dimension unit */
assert(window->frame_width.unit ==
FRAME_DIMENSION_PIXELS ||
window->frame_width.unit ==
FRAME_DIMENSION_PERCENT ||
window->frame_width.unit ==
FRAME_DIMENSION_RELATIVE);
break;
}
avail_width -= widths[col][row];
}
@ -359,24 +369,33 @@ void browser_window_recalculate_frameset(struct browser_window *bw) {
window = &bw->children[index];
switch (window->frame_height.unit) {
case FRAME_DIMENSION_PIXELS:
heights[col][row] = window->frame_height.value *
window->scale;
if (window->border) {
if (row != 0)
heights[col][row] += 1;
if (row != bw->rows - 1)
heights[col][row] += 1;
}
break;
case FRAME_DIMENSION_PERCENT:
heights[col][row] = bw_height *
window->frame_height.value / 100;
break;
case FRAME_DIMENSION_RELATIVE:
heights[col][row] = 0;
relative += window->frame_height.value;
break;
case FRAME_DIMENSION_PIXELS:
heights[col][row] = window->frame_height.value *
window->scale;
if (window->border) {
if (row != 0)
heights[col][row] += 1;
if (row != bw->rows - 1)
heights[col][row] += 1;
}
break;
case FRAME_DIMENSION_PERCENT:
heights[col][row] = bw_height *
window->frame_height.value / 100;
break;
case FRAME_DIMENSION_RELATIVE:
heights[col][row] = 0;
relative += window->frame_height.value;
break;
default:
/* unknown frame dimension unit */
assert(window->frame_height.unit ==
FRAME_DIMENSION_PIXELS ||
window->frame_height.unit ==
FRAME_DIMENSION_PERCENT ||
window->frame_height.unit ==
FRAME_DIMENSION_RELATIVE);
break;
}
avail_height -= heights[col][row];
}