From 5c12755fa6f95c787e2f67eae8600c95af710171 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 20 Jun 2016 19:43:14 +0200 Subject: [PATCH] Pass SharedStyleContext to initial_computed_inline_size. --- components/layout/block.rs | 24 ++++++++++++------------ components/layout/table_wrapper.rs | 13 ++++++------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/components/layout/block.rs b/components/layout/block.rs index d5b588909c1..b89b6a3d8a9 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -2287,7 +2287,7 @@ pub trait ISizeAndMarginsComputer { let mut computed_inline_size = self.initial_computed_inline_size(block, parent_flow_inline_size, - layout_context); + layout_context.shared_context()); let style = block.fragment.style(); match (computed_inline_size, style.get_position().box_sizing) { (MaybeAuto::Specified(size), box_sizing::T::border_box) => { @@ -2382,12 +2382,12 @@ pub trait ISizeAndMarginsComputer { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { MaybeAuto::from_style(block.fragment().style().content_inline_size(), self.containing_block_inline_size(block, parent_flow_inline_size, - layout_context.shared_context())) + shared_context)) } fn containing_block_inline_size(&self, @@ -2839,12 +2839,12 @@ impl ISizeAndMarginsComputer for AbsoluteReplaced { fn initial_computed_inline_size(&self, block: &mut BlockFlow, _: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { let opaque_block = OpaqueFlow::from_flow(block); let containing_block_inline_size = - block.containing_block_size(&layout_context.shared_context().viewport_size, opaque_block).inline; - let container_block_size = block.explicit_block_containing_size(layout_context.shared_context()); + block.containing_block_size(&shared_context.viewport_size, opaque_block).inline; + let container_block_size = block.explicit_block_containing_size(shared_context); let fragment = block.fragment(); fragment.assign_replaced_inline_size_if_necessary(containing_block_inline_size, container_block_size); // For replaced absolute flow, the rest of the constraint solving will @@ -2901,9 +2901,9 @@ impl ISizeAndMarginsComputer for BlockReplaced { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { - let container_block_size = block.explicit_block_containing_size(layout_context.shared_context()); + let container_block_size = block.explicit_block_containing_size(shared_context); let fragment = block.fragment(); fragment.assign_replaced_inline_size_if_necessary(parent_flow_inline_size, container_block_size); // For replaced block flow, the rest of the constraint solving will @@ -2959,9 +2959,9 @@ impl ISizeAndMarginsComputer for FloatReplaced { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { - let container_block_size = block.explicit_block_containing_size(layout_context.shared_context()); + let container_block_size = block.explicit_block_containing_size(shared_context); let fragment = block.fragment(); fragment.assign_replaced_inline_size_if_necessary(parent_flow_inline_size, container_block_size); // For replaced block flow, the rest of the constraint solving will @@ -3047,9 +3047,9 @@ impl ISizeAndMarginsComputer for InlineBlockReplaced { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { - let container_block_size = block.explicit_block_containing_size(layout_context.shared_context()); + let container_block_size = block.explicit_block_containing_size(shared_context); let fragment = block.fragment(); fragment.assign_replaced_inline_size_if_necessary(parent_flow_inline_size, container_block_size); // For replaced block flow, the rest of the constraint solving will diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index eb3cdcadd47..3b1f63dfd2a 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -30,7 +30,6 @@ use std::fmt; use std::ops::Add; use std::sync::Arc; use style::computed_values::{border_collapse, table_layout}; -use style::context::StyleContext; use style::logical_geometry::LogicalSize; use style::properties::{ComputedValues, ServoComputedValues}; use style::servo::SharedStyleContext; @@ -769,12 +768,12 @@ impl ISizeAndMarginsComputer for Table { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { let containing_block_inline_size = self.containing_block_inline_size(block, parent_flow_inline_size, - layout_context.shared_context()); + shared_context); initial_computed_inline_size(block, containing_block_inline_size, self.minimum_width_of_all_columns, @@ -804,12 +803,12 @@ impl ISizeAndMarginsComputer for FloatedTable { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { let containing_block_inline_size = self.containing_block_inline_size(block, parent_flow_inline_size, - layout_context.shared_context()); + shared_context); initial_computed_inline_size(block, containing_block_inline_size, self.minimum_width_of_all_columns, @@ -839,12 +838,12 @@ impl ISizeAndMarginsComputer for AbsoluteTable { fn initial_computed_inline_size(&self, block: &mut BlockFlow, parent_flow_inline_size: Au, - layout_context: &LayoutContext) + shared_context: &SharedStyleContext) -> MaybeAuto { let containing_block_inline_size = self.containing_block_inline_size(block, parent_flow_inline_size, - layout_context.shared_context()); + shared_context); initial_computed_inline_size(block, containing_block_inline_size, self.minimum_width_of_all_columns,