Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused argument to place_float_if_applicable.

Browse source
This commit is contained in:
Ms2ger 2016-06-20 10:58:06 +02:00
parent fa0f2898fb
commit 2383cb2eee
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -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();
}

4
components/layout/flex.rs
View file

@ -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) {

2
components/layout/flow.rs
View file

@ -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

4
components/layout/list_item.rs
View file

@ -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 {

2
components/layout/table_row.rs
View file

@ -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);
}

4
components/layout/table_wrapper.rs
View file

@ -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,