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
This commit is contained in:
Patrick Walton 2014-09-22 17:36:36 -07:00
Родитель 6a33ca11ac
Коммит ba3e9421df
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -906,7 +906,7 @@ impl BlockFlow {
clear::right => floats.clearance(ClearRight), clear::right => floats.clearance(ClearRight),
clear::both => floats.clearance(ClearBoth), 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. // At this point, `cur_b` is at the border edge of the child.
flow::mut_base(kid).position.start.b = cur_b; flow::mut_base(kid).position.start.b = cur_b;