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

layout: Correctly take the inline size of cleared floats into account

Browse source 
when estimating the inline size of block formatting contexts.

The speculated inline-size of the preceding floats was forced to zero at
the wrong time if the float was itself cleared, causing it to overwrite
the speculated value. Shuffling the code around a bit fixes the problem.
This commit is contained in:
Patrick Walton 2015-04-06 17:55:59 -07:00
parent 3c5c2f416b
commit e10af4fc98
4 changed files with 67 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout/block.rs
View file

@ -1313,6 +1313,17 @@ impl BlockFlow {
kid_base.fixed_static_i_offset = fixed_static_i_offset; kid_base.fixed_static_i_offset = fixed_static_i_offset;
} }
// Determine float impaction, and update the inline size speculations if necessary.
if flow::base(kid).flags.contains(CLEARS_LEFT) {
inline_start_floats_impact_child = false;
inline_size_of_preceding_left_floats = Au(0);
}
if flow::base(kid).flags.contains(CLEARS_RIGHT) {
inline_end_floats_impact_child = false;
inline_size_of_preceding_right_floats = Au(0);
}
// Update the speculated inline size if this child is floated.
match flow::base(kid).flags.float_kind() { match flow::base(kid).flags.float_kind() {
float::T::none => {} float::T::none => {}
float::T::left => { float::T::left => {
@ -1353,16 +1364,6 @@ impl BlockFlow {
} }
} }
// Determine float impaction.
if flow::base(kid).flags.contains(CLEARS_LEFT) {
inline_start_floats_impact_child = false;
inline_size_of_preceding_left_floats = Au(0);
}
if flow::base(kid).flags.contains(CLEARS_RIGHT) {
inline_end_floats_impact_child = false;
inline_size_of_preceding_right_floats = Au(0);
}
{ {
let kid_base = flow::mut_base(kid); let kid_base = flow::mut_base(kid);
inline_start_floats_impact_child = inline_start_floats_impact_child || inline_start_floats_impact_child = inline_start_floats_impact_child ||

1
tests/ref/basic.list
View file

@ -50,6 +50,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== background_style_attr.html background_ref.html == background_style_attr.html background_ref.html
== basic_width_px.html basic_width_em.html == basic_width_px.html basic_width_em.html
== block_formatting_context_a.html block_formatting_context_ref.html == block_formatting_context_a.html block_formatting_context_ref.html
== block_formatting_context_cleared_float_a.html block_formatting_context_cleared_float_ref.html
== block_formatting_context_complex_a.html block_formatting_context_complex_ref.html == block_formatting_context_complex_a.html block_formatting_context_complex_ref.html
== block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html == block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html
== block_formatting_context_relative_a.html block_formatting_context_ref.html == block_formatting_context_relative_a.html block_formatting_context_ref.html

28
tests/ref/block_formatting_context_cleared_float_a.html Normal file
View file

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<!--
Tests that block formatting context inline-size speculation works when the floats that impact
the block formatting context are cleared.
-->
<style>
#a {
background: silver;
height: 150px;
width: 150px;
float: right;
clear: right;
}
#b {
background: goldenrod;
height: 300px;
overflow: hidden;
}
</style>
</head>
<body>
<div id=a></div>
<div id=b></div>
</body>
</html>

27
tests/ref/block_formatting_context_cleared_float_ref.html Normal file
View file

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<!--
Tests that block formatting context inline-size speculation works when the floats that impact
the block formatting context are cleared.
-->
<style>
#a {
background: silver;
height: 150px;
width: 150px;
float: right;
}
#b {
background: goldenrod;
height: 300px;
overflow: hidden;
}
</style>
</head>
<body>
<div id=a></div>
<div id=b></div>
</body>
</html>