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

Auto merge of #19522 - KiChjang:remove-border-collapse-field, r=emilio

Browse source 
Remove border_collapse field in InternalTable

This field doesn't seem to serve a purpose after #18252.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19522)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-12-08 16:02:09 -06:00 • committed by GitHub
commit fd785f2424
4 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/layout/table.rs
View file

@ -364,9 +364,7 @@ impl Flow for TableFlow {
} }
} }
let inline_size_computer = InternalTable { let inline_size_computer = InternalTable;
border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
};
inline_size_computer.compute_used_inline_size(&mut self.block_flow, inline_size_computer.compute_used_inline_size(&mut self.block_flow,
shared_context, shared_context,
containing_block_inline_size); containing_block_inline_size);
@ -541,22 +539,18 @@ impl fmt::Debug for TableFlow {
/// Table, TableRowGroup, TableRow, TableCell types. /// Table, TableRowGroup, TableRow, TableCell types.
/// Their inline-sizes are calculated in the same way and do not have margins. /// Their inline-sizes are calculated in the same way and do not have margins.
pub struct InternalTable { pub struct InternalTable;
pub border_collapse: border_collapse::T,
}
impl ISizeAndMarginsComputer for InternalTable { impl ISizeAndMarginsComputer for InternalTable {
fn compute_border_and_padding(&self, block: &mut BlockFlow, containing_block_inline_size: Au) {
block.fragment.compute_border_and_padding(containing_block_inline_size)
}
/// Compute the used value of inline-size, taking care of min-inline-size and max-inline-size. /// Compute the used value of inline-size, taking care of min-inline-size and max-inline-size.
/// ///
/// CSS Section 10.4: Minimum and Maximum inline-sizes /// CSS Section 10.4: Minimum and Maximum inline-sizes
fn compute_used_inline_size(&self, fn compute_used_inline_size(
block: &mut BlockFlow, &self,
shared_context: &SharedStyleContext, block: &mut BlockFlow,
parent_flow_inline_size: Au) { shared_context: &SharedStyleContext,
parent_flow_inline_size: Au
) {
let mut input = self.compute_inline_size_constraint_inputs(block, let mut input = self.compute_inline_size_constraint_inputs(block,
parent_flow_inline_size, parent_flow_inline_size,
shared_context); shared_context);

4
components/layout/table_cell.rs
View file

@ -208,9 +208,7 @@ impl Flow for TableCellFlow {
// The position was set to the column inline-size by the parent flow, table row flow. // The position was set to the column inline-size by the parent flow, table row flow.
let containing_block_inline_size = self.block_flow.base.block_container_inline_size; let containing_block_inline_size = self.block_flow.base.block_container_inline_size;
let inline_size_computer = InternalTable { let inline_size_computer = InternalTable;
border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
};
inline_size_computer.compute_used_inline_size(&mut self.block_flow, inline_size_computer.compute_used_inline_size(&mut self.block_flow,
shared_context, shared_context,
containing_block_inline_size); containing_block_inline_size);

4
components/layout/table_row.rs
View file

@ -353,9 +353,7 @@ impl Flow for TableRowFlow {
let inline_start_content_edge = Au(0); let inline_start_content_edge = Au(0);
let inline_end_content_edge = Au(0); let inline_end_content_edge = Au(0);
let inline_size_computer = InternalTable { let inline_size_computer = InternalTable;
border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
};
inline_size_computer.compute_used_inline_size(&mut self.block_flow, inline_size_computer.compute_used_inline_size(&mut self.block_flow,
shared_context, shared_context,
containing_block_inline_size); containing_block_inline_size);

4
components/layout/table_rowgroup.rs
View file

@ -131,9 +131,7 @@ impl Flow for TableRowGroupFlow {
let content_inline_size = containing_block_inline_size; let content_inline_size = containing_block_inline_size;
let border_collapse = self.block_flow.fragment.style.get_inheritedtable().border_collapse; let border_collapse = self.block_flow.fragment.style.get_inheritedtable().border_collapse;
let inline_size_computer = InternalTable { let inline_size_computer = InternalTable;
border_collapse: border_collapse,
};
inline_size_computer.compute_used_inline_size(&mut self.block_flow, inline_size_computer.compute_used_inline_size(&mut self.block_flow,
shared_context, shared_context,
containing_block_inline_size); containing_block_inline_size);