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

Initialize block_container_inline_size for non-block root flows

Browse source 
Fixes #14948.
This commit is contained in:
Matt Brubeck 2017-01-27 10:56:00 -08:00
parent bd72da5f02
commit 39826f817e
8 changed files with 137 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/layout/block.rs
View file

@ -1701,6 +1701,19 @@ impl BlockFlow {
self.base.floats = Floats::new(self.base.writing_mode);
self.initialize_container_size_for_root(shared_context);
// Our inline-size was set to the inline-size of the containing block by the flow's parent.
// Now compute the real value.
self.propagate_and_compute_used_inline_size(shared_context);
self.guess_inline_size_for_block_formatting_context_if_necessary()
}
/// If this is the root flow, initialize values that would normally be set by the parent.
///
/// Should be called during `assign_inline_sizes` for flows that may be the root.
pub fn initialize_container_size_for_root(&mut self, shared_context: &SharedStyleContext) {
if self.is_root() {
debug!("Setting root position");
self.base.position.start = LogicalPoint::zero(self.base.writing_mode);
@ -1708,12 +1721,6 @@ impl BlockFlow {
self.base.writing_mode, shared_context.viewport_size).inline;
self.base.block_container_writing_mode = self.base.writing_mode;
}
// Our inline-size was set to the inline-size of the containing block by the flow's parent.
// Now compute the real value.
self.propagate_and_compute_used_inline_size(shared_context);
self.guess_inline_size_for_block_formatting_context_if_necessary()
}
fn guess_inline_size_for_block_formatting_context_if_necessary(&mut self) {