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

Merge pull request #3483 from pcwalton/block-formatting-contexts-containing-floats

Browse source 
layout: Block formatting contexts should contain all their floats.

Reviewed-by: glennw
This commit is contained in:
bors-servo 2014-09-26 01:42:27 -06:00
commit ab17d31bbf
4 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -978,13 +978,15 @@ impl BlockFlow {
// root element as having `overflow: scroll` and use the layers-based scrolling // root element as having `overflow: scroll` and use the layers-based scrolling
// infrastructure to make it scrollable. // infrastructure to make it scrollable.
let mut block_size = cur_b - block_start_offset; let mut block_size = cur_b - block_start_offset;
if self.is_root() { let is_root = self.is_root();
if is_root {
let screen_size = LogicalSize::from_physical( let screen_size = LogicalSize::from_physical(
self.fragment.style.writing_mode, layout_context.shared.screen_size); self.fragment.style.writing_mode, layout_context.shared.screen_size);
block_size = Au::max(screen_size.block, block_size) block_size = Au::max(screen_size.block, block_size)
} }
if self.is_float() || self.is_absolutely_positioned() { if is_root || self.formatting_context_type() != NonformattingContext ||
self.is_absolutely_positioned() {
// The content block-size includes all the floats per CSS 2.1 § 10.6.7. The easiest way // The content block-size includes all the floats per CSS 2.1 § 10.6.7. The easiest way
// to handle this is to just treat this as clearance. // to handle this is to just treat this as clearance.
block_size = block_size + floats.clearance(ClearBoth); block_size = block_size + floats.clearance(ClearBoth);

1
tests/ref/basic.list
View file

@ -147,3 +147,4 @@ flaky_gpu,flaky_linux == acid2_noscroll.html acid2_ref_broken.html
== floated_table_with_margin_a.html floated_table_with_margin_ref.html == floated_table_with_margin_a.html floated_table_with_margin_ref.html
== margins_inside_floats_a.html margins_inside_floats_ref.html == margins_inside_floats_a.html margins_inside_floats_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

9
tests/ref/block_formatting_context_containing_floats_a.html Normal file
View file

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<body>
<div style="overflow: hidden; background: green;">
<div style="width: 250px; height: 250px; float: left; background: blue;"></div>
</div>
</body>
</html>

10
tests/ref/block_formatting_context_containing_floats_ref.html Normal file
View file

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<body>
<div style="background: green;">
<div style="width: 250px; height: 250px; float: left; background: blue;"></div>
<div style="clear: left;">
</div>
</body>
</html>