Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3454 from pcwalton/float-clear-bug

Browse source 
layout: Translate floats when clearing non-floated blocks.
This commit is contained in:
Patrick Walton 2014-09-22 17:36:36 -07:00
commit a6ff0479d9
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/block.rs
View file

@ -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;

1
tests/ref/basic.list
View file

@ -138,3 +138,4 @@ flaky_gpu,flaky_linux == acid2_noscroll.html acid2_ref_broken.html
== percentage_height_float_a.html percentage_height_float_ref.html == percentage_height_float_a.html percentage_height_float_ref.html
== img_block_maxwidth_a.html img_block_maxwidth_ref.html == img_block_maxwidth_a.html img_block_maxwidth_ref.html
== img_block_maxwidth_b.html img_block_maxwidth_ref.html == img_block_maxwidth_b.html img_block_maxwidth_ref.html
== float_clearance_a.html float_clearance_ref.html

13
tests/ref/float_clearance_a.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<head>
</head>
<body>
<div style="width: 256px;">
<div style="width: 237px; float: left;">hello</div>
<div style="clear: both;">darkness</div>
<div style="float: left;">my old friend</div>
</div>
</body>
</html>

13
tests/ref/float_clearance_ref.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<head>
</head>
<body>
<div style="width: 256px;">
<div style="width: 237px; float: left;">hello</div>
<div style="clear: both;">darkness</div>
<div>my old friend</div>
</div>
</body>
</html>