From f1c7c7f072a18d56005075550a11d10259a43c45 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 2 Feb 2009 13:54:48 +0000
Subject: Remove unused line_height stuff for now.

svn path=/trunk/netsurf/; revision=6354
---
 render/box.c    |  4 ----
 render/box.h    |  1 -
 render/layout.c | 20 +++-----------------
 3 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'render')

diff --git a/render/box.c b/render/box.c
index 32ed2c5b5..08272d166 100644
--- a/render/box.c
+++ b/render/box.c
@@ -102,7 +102,6 @@ struct box * box_create(struct css_style *style,
 	box->parent = NULL;
 	box->fallback = NULL;
 	box->inline_end = NULL;
-	box->line_height = 0;
 	box->float_children = NULL;
 	box->float_container = NULL;
 	box->next_float = NULL;
@@ -577,9 +576,6 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth)
 		fprintf(stream, "  ");
 
 	fprintf(stream, "%p ", box);
-	if (box->type == BOX_INLINE || box->type == BOX_TEXT ||
-			box->type == BOX_INLINE_END)
-		fprintf(stream, "lh%i ", box->line_height);
 	fprintf(stream, "x%i y%i w%i h%i ", box->x, box->y,
 			box->width, box->height);
 	if (box->max_width != UNKNOWN_MAX_WIDTH)
diff --git a/render/box.h b/render/box.h
index c12e3c343..5d31a198b 100644
--- a/render/box.h
+++ b/render/box.h
@@ -201,7 +201,6 @@ struct box {
 	 * corresponding to this INLINE_END box. */
 	struct box *inline_end;
 	bool inline_new_line;
-	int line_height;
 
 	/** First float child box, or 0. Float boxes are in the tree twice, in
 	 * this list for the block box which defines the area for floats, and
diff --git a/render/layout.c b/render/layout.c
index c24b698a1..f87abe3ed 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -1420,7 +1420,6 @@ bool layout_inline_container(struct box *inline_container, int width,
 		if ((!c->object && c->text && (c->length || is_pre)) ||
 				c->type == BOX_BR)
 			has_text_children = true;
-		c->line_height = 0;
 	}
 
 	/** \todo fix wrapping so that a box with horizontal scrollbar will
@@ -2131,16 +2130,6 @@ bool layout_line(struct box *first, int *width, int *y,
 				(d->style->position == CSS_POSITION_ABSOLUTE ||
 				 d->style->position == CSS_POSITION_FIXED))
 			continue;
-		if (d->type == BOX_INLINE && d->inline_end &&
-				d->next != d->inline_end) {
-			if (d->height > d->inline_end->line_height)
-				d->inline_end->line_height = d->height;
-			for (struct box *il = d; il && il != d->inline_end;
-						il = il->next) {
-				if (d->height > il->line_height)
-					il->line_height = d->height;
-			}
-		}
 		if ((d->type == BOX_INLINE && (d->object || d->gadget)) ||
 				d->type == BOX_INLINE_BLOCK) {
 			h = d->margin[TOP] + d->border[TOP] + d->padding[TOP] +
@@ -2149,13 +2138,10 @@ bool layout_line(struct box *first, int *width, int *y,
 			if (used_height < h)
 				used_height = h;
 		}
-		if (d->line_height > used_height)
-			used_height = d->line_height;
-	}
+		if (d->type == BOX_TEXT && d->height > used_height)
+			used_height = d->height;
 
-	/* Set the line_height for the boxes on the current line */
-	for (d = first; d != b; d = d->next)
-		d->line_height = used_height;
+	}
 
 	first->inline_new_line = true;
 
-- 
cgit v1.2.3