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

Remove some usage of .as_slice().

Browse source
This commit is contained in:
Simon Sapin 2015-04-27 17:38:37 +02:00
parent 0b6f84e6a1
commit 11b3e3b775
4 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/layout/table.rs
View file

@ -284,14 +284,12 @@ impl Flow for TableFlow {
NextBlockCollapsedBorders::FromNextRow( NextBlockCollapsedBorders::FromNextRow(
&next_sibling.as_immutable_table_rowgroup() &next_sibling.as_immutable_table_rowgroup()
.preliminary_collapsed_borders .preliminary_collapsed_borders
.block_start .block_start)
.as_slice())
} else { } else {
NextBlockCollapsedBorders::FromNextRow( NextBlockCollapsedBorders::FromNextRow(
&next_sibling.as_immutable_table_row() &next_sibling.as_immutable_table_row()
.preliminary_collapsed_borders .preliminary_collapsed_borders
.block_start .block_start)
.as_slice())
} }
} }
None => { None => {
@ -352,14 +350,12 @@ impl Flow for TableFlow {
NextBlockCollapsedBorders::FromNextRow( NextBlockCollapsedBorders::FromNextRow(
&grandkid_next_sibling.as_immutable_table_rowgroup() &grandkid_next_sibling.as_immutable_table_rowgroup()
.preliminary_collapsed_borders .preliminary_collapsed_borders
.block_start .block_start)
.as_slice())
} else { } else {
NextBlockCollapsedBorders::FromNextRow( NextBlockCollapsedBorders::FromNextRow(
&grandkid_next_sibling.as_immutable_table_row() &grandkid_next_sibling.as_immutable_table_row()
.preliminary_collapsed_borders .preliminary_collapsed_borders
.block_start .block_start)
.as_slice())
} }
} }
None => { None => {
@ -483,9 +479,9 @@ impl Flow for TableFlow {
self.block_flow.base.flags.remove(IMPACTED_BY_LEFT_FLOATS); self.block_flow.base.flags.remove(IMPACTED_BY_LEFT_FLOATS);
self.block_flow.base.flags.remove(IMPACTED_BY_RIGHT_FLOATS); self.block_flow.base.flags.remove(IMPACTED_BY_RIGHT_FLOATS);
let column_computed_inline_sizes = self.column_computed_inline_sizes.as_slice(); let column_computed_inline_sizes = &self.column_computed_inline_sizes;
let collapsed_inline_direction_border_widths_for_table = let collapsed_inline_direction_border_widths_for_table =
self.collapsed_inline_direction_border_widths_for_table.as_slice(); &self.collapsed_inline_direction_border_widths_for_table;
let mut collapsed_block_direction_border_widths_for_table = let mut collapsed_block_direction_border_widths_for_table =
self.collapsed_block_direction_border_widths_for_table.iter().peekable(); self.collapsed_block_direction_border_widths_for_table.iter().peekable();
self.block_flow.propagate_assigned_inline_size_to_children(layout_context, self.block_flow.propagate_assigned_inline_size_to_children(layout_context,
@ -509,12 +505,12 @@ impl Flow for TableFlow {
if child_flow.is_table_row() { if child_flow.is_table_row() {
let child_table_row = child_flow.as_table_row(); let child_table_row = child_flow.as_table_row();
child_table_row.populate_collapsed_border_spacing( child_table_row.populate_collapsed_border_spacing(
collapsed_inline_direction_border_widths_for_table.as_slice(), collapsed_inline_direction_border_widths_for_table,
&mut collapsed_block_direction_border_widths_for_table); &mut collapsed_block_direction_border_widths_for_table);
} else if child_flow.is_table_rowgroup() { } else if child_flow.is_table_rowgroup() {
let child_table_rowgroup = child_flow.as_table_rowgroup(); let child_table_rowgroup = child_flow.as_table_rowgroup();
child_table_rowgroup.populate_collapsed_border_spacing( child_table_rowgroup.populate_collapsed_border_spacing(
collapsed_inline_direction_border_widths_for_table.as_slice(), collapsed_inline_direction_border_widths_for_table,
&mut collapsed_block_direction_border_widths_for_table); &mut collapsed_block_direction_border_widths_for_table);
} }
}) })

2
components/layout/table_row.rs
View file

@ -380,7 +380,7 @@ impl Flow for TableRowFlow {
child_index, child_index,
content_inline_size, content_inline_size,
writing_mode, writing_mode,
computed_inline_size_for_cells.as_slice(), &computed_inline_size_for_cells,
&spacing, &spacing,
&border_collapse_info, &border_collapse_info,
inline_start_margin_edge) inline_start_margin_edge)

6
components/layout/table_rowgroup.rs
View file

@ -158,10 +158,10 @@ impl Flow for TableRowGroupFlow {
containing_block_inline_size, containing_block_inline_size,
border_collapse); border_collapse);
let column_computed_inline_sizes = self.column_computed_inline_sizes.as_slice(); let column_computed_inline_sizes = &self.column_computed_inline_sizes;
let border_spacing = self.spacing; let border_spacing = self.spacing;
let collapsed_inline_direction_border_widths_for_table = let collapsed_inline_direction_border_widths_for_table =
self.collapsed_inline_direction_border_widths_for_table.as_slice(); &self.collapsed_inline_direction_border_widths_for_table;
let mut collapsed_block_direction_border_widths_for_table = let mut collapsed_block_direction_border_widths_for_table =
self.collapsed_block_direction_border_widths_for_table.iter().peekable(); self.collapsed_block_direction_border_widths_for_table.iter().peekable();
self.block_flow.propagate_assigned_inline_size_to_children(layout_context, self.block_flow.propagate_assigned_inline_size_to_children(layout_context,
@ -186,7 +186,7 @@ impl Flow for TableRowGroupFlow {
if border_collapse == border_collapse::T::collapse { if border_collapse == border_collapse::T::collapse {
let child_table_row = child_flow.as_table_row(); let child_table_row = child_flow.as_table_row();
child_table_row.populate_collapsed_border_spacing( child_table_row.populate_collapsed_border_spacing(
collapsed_inline_direction_border_widths_for_table.as_slice(), collapsed_inline_direction_border_widths_for_table,
&mut collapsed_block_direction_border_widths_for_table); &mut collapsed_block_direction_border_widths_for_table);
} }
}); });

2
components/layout/table_wrapper.rs
View file

@ -351,7 +351,7 @@ impl Flow for TableWrapperFlow {
child_index, child_index,
content_inline_size, content_inline_size,
writing_mode, writing_mode,
assigned_column_inline_sizes.as_slice(), assigned_column_inline_sizes,
&border_spacing, &border_spacing,
&None, &None,
inline_start_margin_edge) inline_start_margin_edge)