diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-28 19:48:45 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-28 19:48:45 -0500 |
commit | 1e150140bd12624ad357e3168fb496079fb8ec7c (patch) | |
tree | 238b47e1dc4329095025773e9ff14d2d0f51d83f /components/layout/table_cell.rs | |
parent | 0a4db7ae0f581a959863bd5159766795c6caf8d8 (diff) | |
parent | 544a02a25068a92dfd9e950eb3609713ad9599c7 (diff) | |
download | servo-1e150140bd12624ad357e3168fb496079fb8ec7c.tar.gz servo-1e150140bd12624ad357e3168fb496079fb8ec7c.zip |
Auto merge of #5480 - SimonSapin:multicol, r=pcwalton
This add some properties to the style system and a new flow type, but the larger issues of dealing with fragmentation in the flow tree is still an open question.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5480)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/table_cell.rs')
-rw-r--r-- | components/layout/table_cell.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 6744fbc2106..8de69f0608d 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -52,7 +52,7 @@ impl TableCellFlow { visible: bool) -> TableCellFlow { TableCellFlow { - block_flow: BlockFlow::from_node_and_fragment(node, fragment), + block_flow: BlockFlow::from_node_and_fragment(node, fragment, None), collapsed_borders: CollapsedBordersForCell::new(), column_span: node.get_unsigned_integer_attribute(UnsignedIntegerAttribute::ColSpan) .unwrap_or(1), |