Prevent iframes with display:inline and percentage width from getting a width of AUTO during minmax layout phase.

svn path=/trunk/netsurf/; revision=12528
This commit is contained in:
Michael Drake 2011-06-28 19:42:31 +00:00
parent 079c138721
commit 4d19457c59

View File

@ -3192,6 +3192,10 @@ struct box *layout_minmax_line(struct box *first,
if (0 < width + fixed) if (0 < width + fixed)
width += fixed; width += fixed;
} else if (b->flags & IFRAME) { } else if (b->flags & IFRAME) {
/* TODO: handle percentage widths properly */
if (width == AUTO)
width = 400;
fixed = frac = 0; fixed = frac = 0;
calculate_mbp_width(b->style, LEFT, true, true, true, calculate_mbp_width(b->style, LEFT, true, true, true,
&fixed, &frac); &fixed, &frac);
@ -3231,7 +3235,8 @@ struct box *layout_minmax_line(struct box *first,
#endif #endif
assert(b != first); assert(b != first);
assert(0 <= *line_min && *line_min <= *line_max); assert(0 <= *line_min);
assert(*line_min <= *line_max);
return b; return b;
} }