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

Remove unused fixed_descendants: AbsoluteDescendants

Browse source 
… in `construct.rs` for multicol and table wrappers.
This commit is contained in:
Simon Sapin 2016-01-12 15:17:13 +01:00
parent 5498b54347
commit f766e94259
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/layout/construct.rs
View file

@ -1093,7 +1093,6 @@ impl<'a, 'ln, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode<'ln>>
let construction_result = self.build_flow_for_block_like(column_flow, node); let construction_result = self.build_flow_for_block_like(column_flow, node);
let mut abs_descendants = AbsoluteDescendants::new(); let mut abs_descendants = AbsoluteDescendants::new();
let mut fixed_descendants = AbsoluteDescendants::new();
if let ConstructionResult::Flow(column_flow, column_abs_descendants) = construction_result { if let ConstructionResult::Flow(column_flow, column_abs_descendants) = construction_result {
flow.add_new_child(column_flow); flow.add_new_child(column_flow);
@ -1109,13 +1108,9 @@ impl<'a, 'ln, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode<'ln>>
abs_descendants = AbsoluteDescendants::new(); abs_descendants = AbsoluteDescendants::new();
let is_fixed_positioned = flow.as_block().is_fixed();
let is_absolutely_positioned = let is_absolutely_positioned =
flow::base(&*flow).flags.contains(IS_ABSOLUTELY_POSITIONED); flow::base(&*flow).flags.contains(IS_ABSOLUTELY_POSITIONED);
if is_fixed_positioned { if is_absolutely_positioned {
// Send itself along with the other fixed descendants.
fixed_descendants.push(flow.clone());
} else if is_absolutely_positioned {
// This is now the only absolute flow in the subtree which hasn't yet // This is now the only absolute flow in the subtree which hasn't yet
// reached its containing block. // reached its containing block.
abs_descendants.push(flow.clone()); abs_descendants.push(flow.clone());
@ -1140,7 +1135,6 @@ impl<'a, 'ln, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode<'ln>>
let construction_result = self.build_flow_for_block_like(table_flow, node); let construction_result = self.build_flow_for_block_like(table_flow, node);
let mut abs_descendants = AbsoluteDescendants::new(); let mut abs_descendants = AbsoluteDescendants::new();
let mut fixed_descendants = AbsoluteDescendants::new();
// The order of the caption and the table are not necessarily the same order as in the DOM // The order of the caption and the table are not necessarily the same order as in the DOM
// tree. All caption blocks are placed before or after the table flow, depending on the // tree. All caption blocks are placed before or after the table flow, depending on the
@ -1168,13 +1162,9 @@ impl<'a, 'ln, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode<'ln>>
abs_descendants = AbsoluteDescendants::new(); abs_descendants = AbsoluteDescendants::new();
let is_fixed_positioned = wrapper_flow.as_block().is_fixed();
let is_absolutely_positioned = let is_absolutely_positioned =
flow::base(&*wrapper_flow).flags.contains(IS_ABSOLUTELY_POSITIONED); flow::base(&*wrapper_flow).flags.contains(IS_ABSOLUTELY_POSITIONED);
if is_fixed_positioned { if is_absolutely_positioned {
// Send itself along with the other fixed descendants.
fixed_descendants.push(wrapper_flow.clone());
} else if is_absolutely_positioned {
// This is now the only absolute flow in the subtree which hasn't yet // This is now the only absolute flow in the subtree which hasn't yet
// reached its containing block. // reached its containing block.
abs_descendants.push(wrapper_flow.clone()); abs_descendants.push(wrapper_flow.clone());