diff options
| -rw-r--r-- | components/layout/block.rs | 6 | ||||
| -rw-r--r-- | components/layout/flex.rs | 4 | ||||
| -rw-r--r-- | components/layout/flow.rs | 2 | ||||
| -rw-r--r-- | components/layout/list_item.rs | 4 | ||||
| -rw-r--r-- | components/layout/table_row.rs | 2 | ||||
| -rw-r--r-- | components/layout/table_wrapper.rs | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index d74490f7734..6571d7d708a 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -820,7 +820,7 @@ impl BlockFlow { flow::base(kid).collapsible_margins .block_start_margin_for_noncollapsible_context() } - kid.place_float_if_applicable(layout_context); + kid.place_float_if_applicable(); if !flow::base(kid).flags.is_float() { kid.assign_block_size_for_inorder_child_if_necessary(layout_context, thread_id); @@ -853,7 +853,7 @@ impl BlockFlow { let float_ceiling = margin_collapse_info.current_float_ceiling(); kid_block.float.as_mut().unwrap().float_ceiling = float_ceiling } - kid.place_float_if_applicable(layout_context); + kid.place_float_if_applicable(); let kid_base = flow::mut_base(kid); floats = kid_base.floats.clone(); @@ -1741,7 +1741,7 @@ impl Flow for BlockFlow { |_, _, _, _, _, _| {}); } - fn place_float_if_applicable<'a>(&mut self, _: &'a LayoutContext<'a>) { + fn place_float_if_applicable<'a>(&mut self) { if self.base.flags.is_float() { self.place_float(); } diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 5a89a627fbe..b977124bf80 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -490,8 +490,8 @@ impl Flow for FlexFlow { self.block_flow.compute_absolute_position(layout_context) } - fn place_float_if_applicable<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { - self.block_flow.place_float_if_applicable(layout_context) + fn place_float_if_applicable<'a>(&mut self) { + self.block_flow.place_float_if_applicable() } fn update_late_computed_inline_position_if_necessary(&mut self, inline_position: Au) { diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 1267ed31cf1..350092acc90 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -228,7 +228,7 @@ pub trait Flow: fmt::Debug + Sync + Send + 'static { -> StackingContextId; /// If this is a float, places it. The default implementation does nothing. - fn place_float_if_applicable<'a>(&mut self, _: &'a LayoutContext<'a>) {} + fn place_float_if_applicable<'a>(&mut self) {} /// Assigns block-sizes in-order; or, if this is a float, places the float. The default /// implementation simply assigns block-sizes if this flow might have floats in. Returns true diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs index f12d290e9a3..de079325e69 100644 --- a/components/layout/list_item.rs +++ b/components/layout/list_item.rs @@ -127,8 +127,8 @@ impl Flow for ListItemFlow { self.block_flow.compute_absolute_position(layout_context) } - fn place_float_if_applicable<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { - self.block_flow.place_float_if_applicable(layout_context) + fn place_float_if_applicable<'a>(&mut self) { + self.block_flow.place_float_if_applicable() } fn is_absolute_containing_block(&self) -> bool { diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index 42257ec5a76..dbeafead32e 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -110,7 +110,7 @@ impl TableRowFlow { let mut max_block_size = Au(0); let thread_id = self.block_flow.base.thread_id; for kid in self.block_flow.base.child_iter_mut() { - kid.place_float_if_applicable(layout_context); + kid.place_float_if_applicable(); if !flow::base(kid).flags.is_float() { kid.assign_block_size_for_inorder_child_if_necessary(layout_context, thread_id); } diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index 9b3b6f5c062..8a7d47562f4 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -416,8 +416,8 @@ impl Flow for TableWrapperFlow { self.block_flow.compute_absolute_position(layout_context) } - fn place_float_if_applicable<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { - self.block_flow.place_float_if_applicable(layout_context) + fn place_float_if_applicable<'a>(&mut self) { + self.block_flow.place_float_if_applicable() } fn assign_block_size_for_inorder_child_if_necessary<'a>(&mut self, |