diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-20 08:17:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-20 08:17:13 -0500 |
commit | c270622bfdd7a409c1a940322f630fd6cbd985c0 (patch) | |
tree | de15876207f24b5c9421c30ff0401ba72e1d0dc4 /components/layout/block.rs | |
parent | a5778fb5da8dbe6229cbd8da7a383b6e336a4ebd (diff) | |
parent | 2383cb2eee90f11ff3e456c0d99c923e65c25f01 (diff) | |
download | servo-c270622bfdd7a409c1a940322f630fd6cbd985c0.tar.gz servo-c270622bfdd7a409c1a940322f630fd6cbd985c0.zip |
Auto merge of #11800 - Ms2ger:place_float_if_applicable, r=nox
Remove unused argument to place_float_if_applicable.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11800)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/block.rs')
-rw-r--r-- | components/layout/block.rs | 6 |
1 files changed, 3 insertions, 3 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(); } |