diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-27 14:47:22 -0800 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-27 14:47:22 -0800 |
commit | cec37a492a8e27ed8c0c8e00157190a0a87cb882 (patch) | |
tree | eb7b1d96472e2574601df0f9d7b443760930ceb0 /components/layout/table_row.rs | |
parent | 98e53db289527803db269a2ced34b59ef8b6230f (diff) | |
download | servo-cec37a492a8e27ed8c0c8e00157190a0a87cb882.tar.gz servo-cec37a492a8e27ed8c0c8e00157190a0a87cb882.zip |
Unconditionally layout rows when laying out tables
If the reflow flag is set on a row it will be on the table anyway
Diffstat (limited to 'components/layout/table_row.rs')
-rw-r--r-- | components/layout/table_row.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index 0d779ac8f2f..dbe0bf7b665 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -115,8 +115,6 @@ impl TableRowFlow { incoming_rowspan_data: &mut Vec<Au>, border_info: &[(Au, Au)], // (_, cumulative_border_size) row_index: usize) -> (Au, Au) { - // XXXManishearth skip this when the REFLOW flag is unset if it is not affected by other - // rows fn include_sizes_from_previous_rows(col: &mut usize, incoming_rowspan: &[u32], incoming_rowspan_data: &mut Vec<Au>, @@ -208,13 +206,12 @@ impl TableRowFlow { (block_size, largest_leftover_incoming_size) } - pub fn assign_block_size_to_self_and_children(&mut self, sizes: &[(Au, Au)], index: usize, effects_rows: &mut u32) { + pub fn assign_block_size_to_self_and_children(&mut self, sizes: &[(Au, Au)], index: usize) { // Assign the block-size of kid fragments, which is the same value as own block-size. let block_size = sizes[index].0; for kid in self.block_flow.base.child_iter_mut() { let child_table_cell = kid.as_mut_table_cell(); let block_size = if child_table_cell.row_span > 1 { - *effects_rows = max(*effects_rows, child_table_cell.row_span); let row_sizes = sizes[index..].iter() .take(child_table_cell.row_span as usize) .fold(Au(0), |accum, size| accum + size.0); |