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

Pass SharedStyleContext to propagate_and_compute_used_inline_size.

Browse source
This commit is contained in:
Ms2ger 2016-06-22 13:44:15 +02:00
parent 21b8d2bd91
commit c33ac876ff
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -1295,9 +1295,9 @@ impl BlockFlow {
/// Compute inline size based using the `block_container_inline_size` set by the parent flow. /// Compute inline size based using the `block_container_inline_size` set by the parent flow.
/// ///
/// This is run in the `AssignISizes` traversal. /// This is run in the `AssignISizes` traversal.
fn propagate_and_compute_used_inline_size(&mut self, layout_context: &LayoutContext) { fn propagate_and_compute_used_inline_size(&mut self, shared_context: &SharedStyleContext) {
let containing_block_inline_size = self.base.block_container_inline_size; let containing_block_inline_size = self.base.block_container_inline_size;
self.compute_used_inline_size(layout_context.shared_context(), containing_block_inline_size); self.compute_used_inline_size(shared_context, containing_block_inline_size);
if self.base.flags.is_float() { if self.base.flags.is_float() {
self.float.as_mut().unwrap().containing_inline_size = containing_block_inline_size self.float.as_mut().unwrap().containing_inline_size = containing_block_inline_size
} }
@ -1640,7 +1640,7 @@ impl BlockFlow {
// Our inline-size was set to the inline-size of the containing block by the flow's parent. // Our inline-size was set to the inline-size of the containing block by the flow's parent.
// Now compute the real value. // Now compute the real value.
self.propagate_and_compute_used_inline_size(layout_context); self.propagate_and_compute_used_inline_size(layout_context.shared_context());
// Now for some speculation. // Now for some speculation.
match self.formatting_context_type() { match self.formatting_context_type() {