From ba3e9421df07f83d97697feaba7af403de2a6ce4 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 22 Sep 2014 17:36:36 -0700
Subject: [PATCH] servo: Merge #3454 - layout: Translate floats when clearing
 non-floated blocks (from pcwalton:float-clear-bug)

Source-Repo: https://github.com/servo/servo
Source-Revision: a6ff0479d9b8ea6a35570765748a6fc86d0dcb47
---
 servo/components/layout/block.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servo/components/layout/block.rs b/servo/components/layout/block.rs
index fedca6509199..a75a2e482740 100644
--- a/servo/components/layout/block.rs
+++ b/servo/components/layout/block.rs
@@ -906,7 +906,7 @@ impl BlockFlow {
                 clear::right => floats.clearance(ClearRight),
                 clear::both => floats.clearance(ClearBoth),
             };
-            cur_b = cur_b + clearance;
+            translate_including_floats(&mut cur_b, clearance, &mut floats);
 
             // At this point, `cur_b` is at the border edge of the child.
             flow::mut_base(kid).position.start.b = cur_b;