Fix float percentage heights to match other browsers: for floated elements the containing block is the nearest ancestor box at block level, rather than the block formatting context block that the float is in.

svn path=/trunk/netsurf/; revision=5553

1 files changed, 16 insertions, 1 deletions

diff --git a/render/layout.c b/render/layout.c
index ee5dde5c3..9065e7d89 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -1023,13 +1023,28 @@ void layout_find_dimensions(int available_width,
 					style);
 			break;
 		case CSS_HEIGHT_PERCENT:
-			if (box->float_container) {
+			if (box->style->position == CSS_POSITION_ABSOLUTE &&
+					box->float_container) {
+				/* Box is absolutely positioned */
 				containing_block = box->float_container;
+			} else if (box->float_container &&
+					box->style->position !=
+					CSS_POSITION_ABSOLUTE &&
+					(box->style->float_ ==
+					CSS_FLOAT_LEFT ||
+					box->style->float_ ==
+					CSS_FLOAT_RIGHT)) {
+				/* Box is a float */
+				assert(box->parent && box->parent->parent &&
+						box->parent->parent->parent);
+				containing_block = box->parent->parent->parent;
 			} else if (box->parent && box->parent->type !=
 					BOX_INLINE_CONTAINER) {
+				/* Box is a block level element */
 				containing_block = box->parent;
 			} else if (box->parent && box->parent->type ==
 					BOX_INLINE_CONTAINER) {
+				/* Box is an inline block */
 				assert(box->parent->parent);
 				containing_block = box->parent->parent;
 			}