layout: During inline layout, make place_between_floats use the same

line height computation logic as final block size assignment.

Improves Wikipedia.
This commit is contained in:
Patrick Walton 2015-04-03 11:35:22 -07:00
parent 51dd6984f7
commit 00a2685cbe
6 changed files with 143 additions and 51 deletions

View file

@ -188,6 +188,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== letter_spacing_a.html letter_spacing_ref.html
== line_breaking_whitespace_collapse_a.html line_breaking_whitespace_collapse_ref.html
== line_height_a.html line_height_ref.html
== line_height_float_placement_a.html line_height_float_placement_ref.html
!= linear_gradients_corners_a.html linear_gradients_corners_ref.html
== linear_gradients_lengths_a.html linear_gradients_lengths_ref.html
== linear_gradients_parsing_a.html linear_gradients_parsing_ref.html

View file

@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style>
* {
margin: 0;
padding: 0;
}
body {
font-size: 16px;
font-family: Ahem, monospace;
padding-top: 5px;
}
#floaty {
float: left;
height: 20px;
width: 100px;
}
#pre {
line-height: 32px;
white-space: pre;
}
</style>
</head>
<body>
<div id=floaty></div>
<div id=pre>x
x</div>
</body>
</html>

View file

@ -0,0 +1,34 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style>
* {
margin: 0;
padding: 0;
}
body {
font-size: 16px;
font-family: Ahem, monospace;
}
#floaty {
float: left;
height: 20px;
width: 100px;
}
#pre {
white-space: pre;
}
.spacer {
color: transparent;
font-size: 32px;
}
</style>
</head>
<body>
<div id=floaty></div>
<div id=pre>x<span class=spacer>x</span>
x<span class=spacer>x</span></div>
</body>
</html>