Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #4937 - Support root element having percentage heights in layout (from glennw:pc-height); r=pcwalton

Browse Source 
This allows using standard CSS techniques to place a footer at the bottom of the page.

Source-Repo: https://github.com/servo/servo
Source-Revision: c7d3ea1c6588512c62ce6688ad0e544dacccfb8f
This commit is contained in:
Glenn Watson 2015-02-16 13:19:02 -07:00
parent 4e8c547103
commit 884bfec2ce
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servo/components/layout/block.rs
View File

@ -1299,8 +1299,16 @@ impl BlockFlow {
// Calculate non-auto block size to pass to children.
let content_block_size = self.fragment.style().content_block_size();
let explicit_content_size = match (content_block_size,
self.base.block_container_explicit_block_size) {
let parent_container_size = if self.is_root() {
let screen_size = LogicalSize::from_physical(self.fragment.style.writing_mode,
layout_context.shared.screen_size);
Some(screen_size.block)
} else {
self.base.block_container_explicit_block_size
};
let explicit_content_size = match (content_block_size, parent_container_size) {
(LengthOrPercentageOrAuto::Percentage(percent), Some(container_size)) => {
Some(container_size.scale_by(percent))
}
@ -1688,10 +1696,10 @@ impl Flow for BlockFlow {
}
} else if self.is_root() || self.base.flags.is_float() || self.is_inline_block() {
// Root element margins should never be collapsed according to CSS § 8.3.1.
debug!("assign_block_size: assigning block_size for root flow");
debug!("assign_block_size: assigning block_size for root flow {:?}", flow::base(self).debug_id());
self.assign_block_size_block_base(ctx, MarginsMayCollapseFlag::MarginsMayNotCollapse);
} else {
debug!("assign_block_size: assigning block_size for block");
debug!("assign_block_size: assigning block_size for block {:?}", flow::base(self).debug_id());
self.assign_block_size_block_base(ctx, MarginsMayCollapseFlag::MarginsMayCollapse);
}
}