Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix confusing push_or_mutate API

Browse source 
This fixes a bug when recalculating border collapsing for an existing table
now. The bug was caused by using `push_or_mutate` which has no effect if there
is already a value at the specified index.

The fix switches incorrect `push_or_mutate` calls to use `push_or_set`
instead. It also renames `push_or_mutate` to `get_mut_or_push` which I think
is a less-confusing name for this method.
This commit is contained in:
Matt Brubeck 2016-02-29 13:05:46 -08:00
parent 4bcdbe6d56
commit 4dc9d8b1c5
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/table.rs
View file

@ -658,21 +658,22 @@ pub struct ColumnComputedInlineSize {
} }
pub trait VecExt<T> { pub trait VecExt<T> {
fn push_or_set(&mut self, index: usize, value: T); fn push_or_set(&mut self, index: usize, value: T) -> &mut T;
fn push_or_mutate(&mut self, index: usize, zero: T) -> &mut T; fn get_mut_or_push(&mut self, index: usize, zero: T) -> &mut T;
} }
impl<T> VecExt<T> for Vec<T> { impl<T> VecExt<T> for Vec<T> {
fn push_or_set(&mut self, index: usize, value: T) { fn push_or_set(&mut self, index: usize, value: T) -> &mut T {
if index < self.len() { if index < self.len() {
self[index] = value self[index] = value
} else { } else {
debug_assert!(index == self.len()); debug_assert!(index == self.len());
self.push(value) self.push(value)
} }
&mut self[index]
} }
fn push_or_mutate(&mut self, index: usize, zero: T) -> &mut T { fn get_mut_or_push(&mut self, index: usize, zero: T) -> &mut T {
if index >= self.len() { if index >= self.len() {
debug_assert!(index == self.len()); debug_assert!(index == self.len());
self.push(zero) self.push(zero)
@ -697,7 +698,7 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow,
.enumerate() { .enumerate() {
child_table_row.final_collapsed_borders.inline.push_or_set(i, *this_inline_border); child_table_row.final_collapsed_borders.inline.push_or_set(i, *this_inline_border);
let inline_spacing = inline_spacing.push_or_mutate(i, Au(0)); let inline_spacing = inline_spacing.get_mut_or_push(i, Au(0));
*inline_spacing = cmp::max(*inline_spacing, this_inline_border.width) *inline_spacing = cmp::max(*inline_spacing, this_inline_border.width)
} }
@ -733,7 +734,7 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow,
.block_end .block_end
.iter() .iter()
.enumerate() { .enumerate() {
let next_block = next_block.push_or_mutate(i, *this_block_border); let next_block = next_block.push_or_set(i, *this_block_border);
match next_block_borders { match next_block_borders {
NextBlockCollapsedBorders::FromNextRow(next_block_borders) => { NextBlockCollapsedBorders::FromNextRow(next_block_borders) => {
if next_block_borders.len() > i { if next_block_borders.len() > i {

7
components/layout/table_row.rs
View file

@ -823,7 +823,8 @@ fn perform_inline_direction_border_collapse_for_row(
child_table_cell: &mut TableCellFlow, child_table_cell: &mut TableCellFlow,
iterator: &mut Peekable<Enumerate<MutFlowListIterator>>, iterator: &mut Peekable<Enumerate<MutFlowListIterator>>,
preliminary_collapsed_borders: &mut CollapsedBordersForRow) { preliminary_collapsed_borders: &mut CollapsedBordersForRow) {
let inline_collapsed_border = preliminary_collapsed_borders.inline.push_or_mutate( println!(" perform_inline_direction_border_collapse_for_row");
let inline_collapsed_border = preliminary_collapsed_borders.inline.push_or_set(
child_index + 1, child_index + 1,
CollapsedBorder::inline_end(&*child_table_cell.block_flow.fragment.style, CollapsedBorder::inline_end(&*child_table_cell.block_flow.fragment.style,
CollapsedBorderProvenance::FromPreviousTableCell)); CollapsedBorderProvenance::FromPreviousTableCell));
@ -838,9 +839,9 @@ fn perform_inline_direction_border_collapse_for_row(
let block_start_border = let block_start_border =
CollapsedBorder::block_start(&*child_table_cell.block_flow.fragment.style, CollapsedBorder::block_start(&*child_table_cell.block_flow.fragment.style,
CollapsedBorderProvenance::FromNextTableCell); CollapsedBorderProvenance::FromNextTableCell);
preliminary_collapsed_borders.block_start.push_or_mutate(child_index, block_start_border); preliminary_collapsed_borders.block_start.push_or_set(child_index, block_start_border);
let block_end_border = let block_end_border =
CollapsedBorder::block_end(&*child_table_cell.block_flow.fragment.style, CollapsedBorder::block_end(&*child_table_cell.block_flow.fragment.style,
CollapsedBorderProvenance::FromPreviousTableCell); CollapsedBorderProvenance::FromPreviousTableCell);
preliminary_collapsed_borders.block_end.push_or_mutate(child_index, block_end_border); preliminary_collapsed_borders.block_end.push_or_set(child_index, block_end_border);
} }