mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Add the HTMLTableCellElement::rowspan property
This commit is contained in:
parent
b77a0a89cf
commit
e982d6003f
10 changed files with 52 additions and 763 deletions
|
@ -41,6 +41,9 @@ pub struct TableCellFlow {
|
|||
/// The column span of this cell.
|
||||
pub column_span: u32,
|
||||
|
||||
/// The rows spanned by this cell.
|
||||
pub row_span: u32,
|
||||
|
||||
/// Whether this cell is visible. If false, the value of `empty-cells` means that we must not
|
||||
/// display this cell.
|
||||
pub visible: bool,
|
||||
|
@ -52,6 +55,7 @@ impl TableCellFlow {
|
|||
block_flow: BlockFlow::from_fragment(fragment),
|
||||
collapsed_borders: CollapsedBordersForCell::new(),
|
||||
column_span: 1,
|
||||
row_span: 1,
|
||||
visible: true,
|
||||
}
|
||||
}
|
||||
|
@ -62,6 +66,7 @@ impl TableCellFlow {
|
|||
block_flow: BlockFlow::from_fragment(fragment),
|
||||
collapsed_borders: CollapsedBordersForCell::new(),
|
||||
column_span: node.get_colspan(),
|
||||
row_span: node.get_rowspan(),
|
||||
visible: visible,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,6 +78,8 @@ pub struct CellIntrinsicInlineSize {
|
|||
pub column_size: ColumnIntrinsicInlineSize,
|
||||
/// The column span of this cell.
|
||||
pub column_span: u32,
|
||||
/// The row span of this cell.
|
||||
pub row_span: u32,
|
||||
}
|
||||
|
||||
|
||||
|
@ -268,6 +270,7 @@ impl Flow for TableRowFlow {
|
|||
// fixed and automatic table layout calculation.
|
||||
let child_specified_inline_size;
|
||||
let child_column_span;
|
||||
let child_row_span;
|
||||
{
|
||||
let child_table_cell = kid.as_mut_table_cell();
|
||||
child_specified_inline_size = child_table_cell.block_flow
|
||||
|
@ -275,6 +278,7 @@ impl Flow for TableRowFlow {
|
|||
.style
|
||||
.content_inline_size();
|
||||
child_column_span = child_table_cell.column_span;
|
||||
child_row_span = child_table_cell.row_span;
|
||||
|
||||
// Perform border collapse if necessary.
|
||||
if collapsing_borders {
|
||||
|
@ -319,6 +323,7 @@ impl Flow for TableRowFlow {
|
|||
self.cell_intrinsic_inline_sizes.push(CellIntrinsicInlineSize {
|
||||
column_size: child_column_inline_size,
|
||||
column_span: child_column_span,
|
||||
row_span: child_row_span,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue