Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle rowspan

Browse source
This commit is contained in:
Manish Goregaokar 2018-02-14 17:17:34 -08:00
parent cfa81e8b79
commit f796823b94
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/table.rs
View file

@ -1089,6 +1089,16 @@ impl<'table> Iterator for TableCellStyleIterator<'table> {
// FIXME We do this awkward .take() followed by shoving it back in
// because without NLL the row_info borrow lasts too long
if let Some(mut row_info) = self.row_info.take() {
if let Some(rowspan) = row_info.row.incoming_rowspan.get(self.column_index.absolute as usize) {
// we are not allowed to use this column as a starting point. Try the next one.
if *rowspan > 1 {
self.column_index.advance(1, &self.column_styles);
// put row_info back in
self.row_info = Some(row_info);
// try again
return self.next();
}
}
if let Some(cell) = row_info.cell_iterator.next() {
let rowgroup_style = row_info.rowgroup.map(|r| r.style());
let row_style = row_info.row.block_flow.fragment.style();