servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
|
|
|
//! CSS table formatting contexts.
|
|
|
|
|
2014-11-13 06:48:31 +03:00
|
|
|
#![deny(unsafe_blocks)]
|
2014-06-04 09:25:28 +04:00
|
|
|
|
2014-12-18 04:45:49 +03:00
|
|
|
use block::{BlockFlow, ISizeAndMarginsComputer, MarginsMayCollapseFlag};
|
2014-07-19 00:27:23 +04:00
|
|
|
use block::{ISizeConstraintInput, ISizeConstraintSolution};
|
2014-07-01 16:02:50 +04:00
|
|
|
use construct::FlowConstructor;
|
|
|
|
use context::LayoutContext;
|
|
|
|
use floats::FloatKind;
|
2014-12-16 05:33:46 +03:00
|
|
|
use flow::{mod, Flow, FlowClass, IMPACTED_BY_LEFT_FLOATS, IMPACTED_BY_RIGHT_FLOATS};
|
2014-12-18 04:45:49 +03:00
|
|
|
use flow::ImmutableFlowUtils;
|
2014-11-03 22:03:37 +03:00
|
|
|
use fragment::{Fragment, FragmentBoundsIterator};
|
2014-09-20 06:50:47 +04:00
|
|
|
use layout_debug;
|
2014-10-15 01:42:32 +04:00
|
|
|
use model::{IntrinsicISizes, IntrinsicISizesContribution};
|
2014-12-16 05:33:46 +03:00
|
|
|
use table_row::CellIntrinsicInlineSize;
|
2014-12-18 04:45:49 +03:00
|
|
|
use table_wrapper::TableLayout;
|
2014-07-01 16:02:50 +04:00
|
|
|
use wrapper::ThreadSafeLayoutNode;
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
|
|
|
use servo_util::geometry::Au;
|
2014-09-15 20:29:39 +04:00
|
|
|
use servo_util::logical_geometry::LogicalRect;
|
2014-09-20 02:17:55 +04:00
|
|
|
use std::cmp::max;
|
2014-05-07 07:37:35 +04:00
|
|
|
use std::fmt;
|
2014-10-31 23:39:34 +03:00
|
|
|
use style::{ComputedValues, CSSFloat};
|
2014-12-18 04:45:49 +03:00
|
|
|
use style::computed_values::{LengthOrPercentageOrAuto, table_layout};
|
2014-10-31 23:39:34 +03:00
|
|
|
use sync::Arc;
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
2014-05-29 04:34:06 +04:00
|
|
|
/// A table flow corresponded to the table's internal table fragment under a table wrapper flow.
|
|
|
|
/// The properties `position`, `float`, and `margin-*` are used on the table wrapper fragment,
|
|
|
|
/// not table fragment per CSS 2.1 § 10.5.
|
2014-09-20 06:50:47 +04:00
|
|
|
#[deriving(Encodable)]
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
pub struct TableFlow {
|
2014-04-28 02:52:39 +04:00
|
|
|
pub block_flow: BlockFlow,
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
2014-12-12 04:06:53 +03:00
|
|
|
/// Information about the intrinsic inline-sizes of each column, computed bottom-up during
|
|
|
|
/// intrinsic inline-size bubbling.
|
|
|
|
pub column_intrinsic_inline_sizes: Vec<ColumnIntrinsicInlineSize>,
|
|
|
|
|
|
|
|
/// Information about the actual inline-sizes of each column, computed top-down during actual
|
|
|
|
/// inline-size bubbling.
|
|
|
|
pub column_computed_inline_sizes: Vec<ColumnComputedInlineSize>,
|
2014-04-04 05:01:48 +04:00
|
|
|
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
/// Table-layout property
|
2014-04-28 02:52:39 +04:00
|
|
|
pub table_layout: TableLayout,
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
impl TableFlow {
|
2014-05-29 04:34:06 +04:00
|
|
|
pub fn from_node_and_fragment(node: &ThreadSafeLayoutNode,
|
|
|
|
fragment: Fragment)
|
|
|
|
-> TableFlow {
|
|
|
|
let mut block_flow = BlockFlow::from_node_and_fragment(node, fragment);
|
|
|
|
let table_layout = if block_flow.fragment().style().get_table().table_layout ==
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout::fixed {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Fixed
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
} else {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Auto
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
};
|
|
|
|
TableFlow {
|
|
|
|
block_flow: block_flow,
|
2014-12-12 04:06:53 +03:00
|
|
|
column_intrinsic_inline_sizes: Vec::new(),
|
|
|
|
column_computed_inline_sizes: Vec::new(),
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout: table_layout
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn from_node(constructor: &mut FlowConstructor,
|
|
|
|
node: &ThreadSafeLayoutNode)
|
|
|
|
-> TableFlow {
|
|
|
|
let mut block_flow = BlockFlow::from_node(constructor, node);
|
2014-05-29 04:34:06 +04:00
|
|
|
let table_layout = if block_flow.fragment().style().get_table().table_layout ==
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout::fixed {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Fixed
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
} else {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Auto
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
};
|
|
|
|
TableFlow {
|
|
|
|
block_flow: block_flow,
|
2014-12-12 04:06:53 +03:00
|
|
|
column_intrinsic_inline_sizes: Vec::new(),
|
|
|
|
column_computed_inline_sizes: Vec::new(),
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout: table_layout
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn float_from_node(constructor: &mut FlowConstructor,
|
|
|
|
node: &ThreadSafeLayoutNode,
|
|
|
|
float_kind: FloatKind)
|
|
|
|
-> TableFlow {
|
|
|
|
let mut block_flow = BlockFlow::float_from_node(constructor, node, float_kind);
|
2014-05-29 04:34:06 +04:00
|
|
|
let table_layout = if block_flow.fragment().style().get_table().table_layout ==
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout::fixed {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Fixed
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
} else {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Auto
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
};
|
|
|
|
TableFlow {
|
|
|
|
block_flow: block_flow,
|
2014-12-12 04:06:53 +03:00
|
|
|
column_intrinsic_inline_sizes: Vec::new(),
|
|
|
|
column_computed_inline_sizes: Vec::new(),
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
table_layout: table_layout
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
/// Update the corresponding value of `self_inline_sizes` if a value of `kid_inline_sizes` has
|
|
|
|
/// a larger value than one of `self_inline_sizes`. Returns the minimum and preferred inline
|
|
|
|
/// sizes.
|
2014-12-16 05:33:46 +03:00
|
|
|
fn update_automatic_column_inline_sizes(
|
|
|
|
parent_inline_sizes: &mut Vec<ColumnIntrinsicInlineSize>,
|
|
|
|
child_cell_inline_sizes: &[CellIntrinsicInlineSize])
|
|
|
|
-> IntrinsicISizes {
|
2014-10-15 01:42:32 +04:00
|
|
|
let mut total_inline_sizes = IntrinsicISizes::new();
|
2014-12-16 05:33:46 +03:00
|
|
|
let mut column_index = 0;
|
|
|
|
for child_cell_inline_size in child_cell_inline_sizes.iter() {
|
|
|
|
for _ in range(0, child_cell_inline_size.column_span) {
|
|
|
|
if column_index < parent_inline_sizes.len() {
|
|
|
|
// We already have some intrinsic size information for this column. Merge it in
|
|
|
|
// according to the rules specified in INTRINSIC § 4.
|
|
|
|
let parent_sizes = &mut parent_inline_sizes[column_index];
|
|
|
|
if child_cell_inline_size.column_span > 1 {
|
|
|
|
// TODO(pcwalton): Perform the recursive algorithm specified in INTRINSIC §
|
|
|
|
// 4. For now we make this column contribute no width.
|
|
|
|
} else {
|
|
|
|
let column_size = &child_cell_inline_size.column_size;
|
|
|
|
*parent_sizes = ColumnIntrinsicInlineSize {
|
|
|
|
minimum_length: max(parent_sizes.minimum_length,
|
|
|
|
column_size.minimum_length),
|
|
|
|
percentage: parent_sizes.greatest_percentage(column_size),
|
|
|
|
preferred: max(parent_sizes.preferred, column_size.preferred),
|
|
|
|
constrained: parent_sizes.constrained || column_size.constrained,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// We discovered a new column. Initialize its data.
|
|
|
|
debug_assert!(column_index == parent_inline_sizes.len());
|
|
|
|
if child_cell_inline_size.column_span > 1 {
|
|
|
|
// TODO(pcwalton): Perform the recursive algorithm specified in INTRINSIC §
|
|
|
|
// 4. For now we make this column contribute no width.
|
|
|
|
parent_inline_sizes.push(ColumnIntrinsicInlineSize::new())
|
|
|
|
} else {
|
|
|
|
parent_inline_sizes.push(child_cell_inline_size.column_size)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
total_inline_sizes.minimum_inline_size = total_inline_sizes.minimum_inline_size +
|
|
|
|
parent_inline_sizes[column_index].minimum_length;
|
|
|
|
total_inline_sizes.preferred_inline_size =
|
|
|
|
total_inline_sizes.preferred_inline_size +
|
|
|
|
parent_inline_sizes[column_index].preferred;
|
|
|
|
|
|
|
|
column_index += 1
|
|
|
|
}
|
2014-04-04 05:01:48 +04:00
|
|
|
}
|
2014-12-16 05:33:46 +03:00
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
total_inline_sizes
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
/// Assign block-size for table flow.
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
///
|
2014-04-04 05:01:48 +04:00
|
|
|
/// TODO(#2014, pcwalton): This probably doesn't handle margin collapse right.
|
|
|
|
///
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
/// inline(always) because this is only ever called by in-order or non-in-order top-level
|
|
|
|
/// methods
|
|
|
|
#[inline(always)]
|
2014-08-11 16:20:07 +04:00
|
|
|
fn assign_block_size_table_base<'a>(&mut self, layout_context: &'a LayoutContext<'a>) {
|
2014-12-18 04:45:49 +03:00
|
|
|
self.block_flow.assign_block_size_block_base(layout_context, MarginsMayCollapseFlag::MarginsMayNotCollapse);
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
2014-12-16 05:33:46 +03:00
|
|
|
|
|
|
|
/// Updates the minimum and preferred inline-size calculation for a single row. This is
|
|
|
|
/// factored out into a separate function because we process children of rowgroups too.
|
|
|
|
fn update_column_inline_sizes_for_row(child: &mut Flow,
|
|
|
|
column_inline_sizes: &mut Vec<ColumnIntrinsicInlineSize>,
|
|
|
|
computation: &mut IntrinsicISizesContribution,
|
|
|
|
did_first_row: &mut bool,
|
|
|
|
table_layout: TableLayout) {
|
|
|
|
// Read column inline-sizes from the table-row, and assign inline-size=0 for the columns
|
|
|
|
// not defined in the column group.
|
|
|
|
//
|
|
|
|
// FIXME: Need to read inline-sizes from either table-header-group OR the first table-row.
|
|
|
|
debug_assert!(child.is_table_row());
|
|
|
|
let row = child.as_table_row();
|
|
|
|
match table_layout {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Fixed => {
|
2014-12-16 05:33:46 +03:00
|
|
|
// Fixed table layout only looks at the first row.
|
|
|
|
//
|
|
|
|
// FIXME(pcwalton): This is really inefficient. We should stop after the first row!
|
|
|
|
if !*did_first_row {
|
|
|
|
*did_first_row = true;
|
|
|
|
for cell_inline_size in row.cell_intrinsic_inline_sizes.iter() {
|
|
|
|
column_inline_sizes.push(cell_inline_size.column_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Auto => {
|
2014-12-16 05:33:46 +03:00
|
|
|
computation.union_block(&TableFlow::update_automatic_column_inline_sizes(
|
|
|
|
column_inline_sizes,
|
|
|
|
row.cell_intrinsic_inline_sizes.as_slice()))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Flow for TableFlow {
|
|
|
|
fn class(&self) -> FlowClass {
|
2014-12-18 04:45:49 +03:00
|
|
|
FlowClass::Table
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
fn as_table<'a>(&'a mut self) -> &'a mut TableFlow {
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2014-09-20 06:50:47 +04:00
|
|
|
fn as_immutable_table<'a>(&'a self) -> &'a TableFlow {
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
fn as_block<'a>(&'a mut self) -> &'a mut BlockFlow {
|
|
|
|
&mut self.block_flow
|
|
|
|
}
|
|
|
|
|
2014-12-12 04:06:53 +03:00
|
|
|
fn column_intrinsic_inline_sizes<'a>(&'a mut self) -> &'a mut Vec<ColumnIntrinsicInlineSize> {
|
|
|
|
&mut self.column_intrinsic_inline_sizes
|
|
|
|
}
|
|
|
|
|
|
|
|
fn column_computed_inline_sizes<'a>(&'a mut self) -> &'a mut Vec<ColumnComputedInlineSize> {
|
|
|
|
&mut self.column_computed_inline_sizes
|
2014-04-04 05:01:48 +04:00
|
|
|
}
|
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
/// The specified column inline-sizes are set from column group and the first row for the fixed
|
2014-04-04 05:01:48 +04:00
|
|
|
/// table layout calculation.
|
2014-07-19 00:27:23 +04:00
|
|
|
/// The maximum min/pref inline-sizes of each column are set from the rows for the automatic
|
2014-04-04 05:01:48 +04:00
|
|
|
/// table layout calculation.
|
2014-10-15 00:06:36 +04:00
|
|
|
fn bubble_inline_sizes(&mut self) {
|
2014-10-17 22:15:23 +04:00
|
|
|
let _scope = layout_debug_scope!("table::bubble_inline_sizes {:x}",
|
2014-10-15 00:06:36 +04:00
|
|
|
self.block_flow.base.debug_id());
|
2014-09-20 06:50:47 +04:00
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
let mut computation = IntrinsicISizesContribution::new();
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
let mut did_first_row = false;
|
|
|
|
for kid in self.block_flow.base.child_iter() {
|
2014-10-15 01:42:32 +04:00
|
|
|
debug_assert!(kid.is_proper_table_child());
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
if kid.is_table_colgroup() {
|
2014-10-15 01:42:32 +04:00
|
|
|
for specified_inline_size in kid.as_table_colgroup().inline_sizes.iter() {
|
2014-12-12 04:06:53 +03:00
|
|
|
self.column_intrinsic_inline_sizes.push(ColumnIntrinsicInlineSize {
|
2014-10-15 01:42:32 +04:00
|
|
|
minimum_length: match *specified_inline_size {
|
2014-12-18 04:45:49 +03:00
|
|
|
LengthOrPercentageOrAuto::Auto | LengthOrPercentageOrAuto::Percentage(_) => Au(0),
|
|
|
|
LengthOrPercentageOrAuto::Length(length) => length,
|
2014-10-15 01:42:32 +04:00
|
|
|
},
|
|
|
|
percentage: match *specified_inline_size {
|
2014-12-18 04:45:49 +03:00
|
|
|
LengthOrPercentageOrAuto::Auto | LengthOrPercentageOrAuto::Length(_) => 0.0,
|
|
|
|
LengthOrPercentageOrAuto::Percentage(percentage) => percentage,
|
2014-10-15 01:42:32 +04:00
|
|
|
},
|
|
|
|
preferred: Au(0),
|
|
|
|
constrained: false,
|
|
|
|
})
|
|
|
|
}
|
2014-12-16 05:33:46 +03:00
|
|
|
} else if kid.is_table_rowgroup() {
|
|
|
|
for grandkid in flow::mut_base(kid).child_iter() {
|
|
|
|
TableFlow::update_column_inline_sizes_for_row(
|
|
|
|
grandkid,
|
|
|
|
&mut self.column_intrinsic_inline_sizes,
|
|
|
|
&mut computation,
|
|
|
|
&mut did_first_row,
|
|
|
|
self.table_layout)
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
2014-12-16 05:33:46 +03:00
|
|
|
} else if kid.is_table_row() {
|
|
|
|
TableFlow::update_column_inline_sizes_for_row(
|
|
|
|
kid,
|
|
|
|
&mut self.column_intrinsic_inline_sizes,
|
|
|
|
&mut computation,
|
|
|
|
&mut did_first_row,
|
|
|
|
self.table_layout)
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
2014-04-04 05:01:48 +04:00
|
|
|
}
|
2014-09-19 11:50:50 +04:00
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
self.block_flow.base.intrinsic_inline_sizes = computation.finish()
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
/// Recursively (top-down) determines the actual inline-size of child contexts and fragments.
|
|
|
|
/// When called on this context, the context has had its inline-size set by the parent context.
|
|
|
|
fn assign_inline_sizes(&mut self, layout_context: &LayoutContext) {
|
2014-10-17 22:15:23 +04:00
|
|
|
let _scope = layout_debug_scope!("table::assign_inline_sizes {:x}",
|
2014-09-20 06:50:47 +04:00
|
|
|
self.block_flow.base.debug_id());
|
2014-07-19 00:27:23 +04:00
|
|
|
debug!("assign_inline_sizes({}): assigning inline_size for flow", "table");
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
|
|
|
// The position was set to the containing block by the flow's parent.
|
2014-10-14 04:03:40 +04:00
|
|
|
let containing_block_inline_size = self.block_flow.base.block_container_inline_size;
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
let mut num_unspecified_inline_sizes = 0;
|
2014-10-15 01:42:32 +04:00
|
|
|
let mut total_column_inline_size = Au(0);
|
2014-12-12 04:06:53 +03:00
|
|
|
for column_inline_size in self.column_intrinsic_inline_sizes.iter() {
|
2014-10-15 01:42:32 +04:00
|
|
|
let this_column_inline_size = column_inline_size.minimum_length;
|
|
|
|
if this_column_inline_size == Au(0) {
|
|
|
|
num_unspecified_inline_sizes += 1
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
} else {
|
2014-10-15 01:42:32 +04:00
|
|
|
total_column_inline_size = total_column_inline_size + this_column_inline_size
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
let inline_size_computer = InternalTable;
|
2014-10-20 22:54:34 +04:00
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
inline_size_computer.compute_used_inline_size(&mut self.block_flow,
|
|
|
|
layout_context,
|
|
|
|
containing_block_inline_size);
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
let inline_start_content_edge = self.block_flow.fragment.border_padding.inline_start;
|
|
|
|
let padding_and_borders = self.block_flow.fragment.border_padding.inline_start_end();
|
2014-10-15 01:42:32 +04:00
|
|
|
let content_inline_size =
|
|
|
|
self.block_flow.fragment.border_box.size.inline - padding_and_borders;
|
2014-10-20 22:54:34 +04:00
|
|
|
|
2014-04-04 05:01:48 +04:00
|
|
|
match self.table_layout {
|
2014-12-18 04:45:49 +03:00
|
|
|
TableLayout::Fixed => {
|
2014-10-15 01:42:32 +04:00
|
|
|
// In fixed table layout, we distribute extra space among the unspecified columns
|
|
|
|
// if there are any, or among all the columns if all are specified.
|
2014-12-12 04:06:53 +03:00
|
|
|
self.column_computed_inline_sizes.clear();
|
2014-12-16 05:33:46 +03:00
|
|
|
if num_unspecified_inline_sizes == 0 {
|
2014-12-12 04:06:53 +03:00
|
|
|
let ratio = content_inline_size.to_subpx() /
|
|
|
|
total_column_inline_size.to_subpx();
|
|
|
|
for column_inline_size in self.column_intrinsic_inline_sizes.iter() {
|
|
|
|
self.column_computed_inline_sizes.push(ColumnComputedInlineSize {
|
|
|
|
size: column_inline_size.minimum_length.scale_by(ratio),
|
|
|
|
});
|
2014-04-04 05:01:48 +04:00
|
|
|
}
|
2014-07-19 00:27:23 +04:00
|
|
|
} else if num_unspecified_inline_sizes != 0 {
|
2014-10-15 01:42:32 +04:00
|
|
|
let extra_column_inline_size =
|
|
|
|
(content_inline_size - total_column_inline_size) /
|
|
|
|
num_unspecified_inline_sizes;
|
2014-12-12 04:06:53 +03:00
|
|
|
for column_inline_size in self.column_intrinsic_inline_sizes.iter() {
|
2014-10-15 01:42:32 +04:00
|
|
|
if column_inline_size.minimum_length == Au(0) &&
|
|
|
|
column_inline_size.percentage == 0.0 {
|
2014-12-12 04:06:53 +03:00
|
|
|
self.column_computed_inline_sizes.push(ColumnComputedInlineSize {
|
|
|
|
size: extra_column_inline_size / num_unspecified_inline_sizes,
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
self.column_computed_inline_sizes.push(ColumnComputedInlineSize {
|
|
|
|
size: column_inline_size.minimum_length,
|
|
|
|
});
|
2014-04-04 05:01:48 +04:00
|
|
|
}
|
|
|
|
}
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
}
|
2014-12-12 04:06:53 +03:00
|
|
|
_ => {
|
|
|
|
// The table wrapper already computed the inline-sizes and propagated them down
|
|
|
|
// to us.
|
|
|
|
}
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
2014-09-26 03:00:34 +04:00
|
|
|
// As tables are always wrapped inside a table wrapper, they are never impacted by floats.
|
2014-11-18 21:42:32 +03:00
|
|
|
self.block_flow.base.flags.remove(IMPACTED_BY_LEFT_FLOATS);
|
|
|
|
self.block_flow.base.flags.remove(IMPACTED_BY_RIGHT_FLOATS);
|
2014-09-25 20:36:33 +04:00
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
self.block_flow.propagate_assigned_inline_size_to_children(
|
2014-12-13 01:57:46 +03:00
|
|
|
layout_context,
|
2014-10-15 01:42:32 +04:00
|
|
|
inline_start_content_edge,
|
|
|
|
content_inline_size,
|
2014-12-12 04:06:53 +03:00
|
|
|
Some(self.column_computed_inline_sizes.as_slice()));
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
2014-08-11 16:20:07 +04:00
|
|
|
fn assign_block_size<'a>(&mut self, ctx: &'a LayoutContext<'a>) {
|
2014-07-19 00:27:23 +04:00
|
|
|
debug!("assign_block_size: assigning block_size for table");
|
|
|
|
self.assign_block_size_table_base(ctx);
|
2014-05-03 03:10:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
fn compute_absolute_position(&mut self) {
|
|
|
|
self.block_flow.compute_absolute_position()
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
2014-09-15 20:29:39 +04:00
|
|
|
|
|
|
|
fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
|
|
|
|
self.block_flow.generated_containing_block_rect()
|
|
|
|
}
|
2014-10-02 05:36:25 +04:00
|
|
|
|
|
|
|
fn update_late_computed_inline_position_if_necessary(&mut self, inline_position: Au) {
|
|
|
|
self.block_flow.update_late_computed_inline_position_if_necessary(inline_position)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_late_computed_block_position_if_necessary(&mut self, block_position: Au) {
|
|
|
|
self.block_flow.update_late_computed_block_position_if_necessary(block_position)
|
|
|
|
}
|
2014-10-22 20:54:35 +04:00
|
|
|
|
|
|
|
fn build_display_list(&mut self, layout_context: &LayoutContext) {
|
|
|
|
self.block_flow.build_display_list(layout_context);
|
|
|
|
}
|
2014-10-31 23:39:34 +03:00
|
|
|
|
|
|
|
fn repair_style(&mut self, new_style: &Arc<ComputedValues>) {
|
|
|
|
self.block_flow.repair_style(new_style)
|
|
|
|
}
|
2014-11-03 22:03:37 +03:00
|
|
|
|
|
|
|
fn iterate_through_fragment_bounds(&self, iterator: &mut FragmentBoundsIterator) {
|
|
|
|
self.block_flow.iterate_through_fragment_bounds(iterator);
|
|
|
|
}
|
2014-05-07 07:37:35 +04:00
|
|
|
}
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
|
2014-05-07 07:37:35 +04:00
|
|
|
impl fmt::Show for TableFlow {
|
|
|
|
/// Outputs a debugging string describing this table flow.
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
2014-06-05 21:58:44 +04:00
|
|
|
write!(f, "TableFlow: {}", self.block_flow)
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Table, TableRowGroup, TableRow, TableCell types.
|
2014-07-19 00:27:23 +04:00
|
|
|
/// Their inline-sizes are calculated in the same way and do not have margins.
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
pub struct InternalTable;
|
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
impl ISizeAndMarginsComputer for InternalTable {
|
|
|
|
/// Compute the used value of inline-size, taking care of min-inline-size and max-inline-size.
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
///
|
2014-07-19 00:27:23 +04:00
|
|
|
/// CSS Section 10.4: Minimum and Maximum inline-sizes
|
|
|
|
fn compute_used_inline_size(&self,
|
2014-10-15 01:42:32 +04:00
|
|
|
block: &mut BlockFlow,
|
|
|
|
ctx: &LayoutContext,
|
|
|
|
parent_flow_inline_size: Au) {
|
|
|
|
let input = self.compute_inline_size_constraint_inputs(block,
|
|
|
|
parent_flow_inline_size,
|
|
|
|
ctx);
|
2014-07-19 00:27:23 +04:00
|
|
|
let solution = self.solve_inline_size_constraints(block, &input);
|
2014-10-20 22:54:34 +04:00
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
self.set_inline_size_constraint_solutions(block, solution);
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
|
2014-07-19 00:27:23 +04:00
|
|
|
/// Solve the inline-size and margins constraints for this block flow.
|
|
|
|
fn solve_inline_size_constraints(&self, _: &mut BlockFlow, input: &ISizeConstraintInput)
|
|
|
|
-> ISizeConstraintSolution {
|
2014-10-15 01:42:32 +04:00
|
|
|
ISizeConstraintSolution::new(input.available_inline_size, Au(0), Au(0))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-12 04:06:53 +03:00
|
|
|
/// Information about the intrinsic inline sizes of columns within a table.
|
2014-10-15 01:42:32 +04:00
|
|
|
///
|
|
|
|
/// During table inline-size bubbling, we might need to store both a percentage constraint and a
|
|
|
|
/// specific width constraint. For instance, one cell might say that it wants to be 100 pixels wide
|
|
|
|
/// in the inline direction and another cell might say that it wants to take up 20% of the inline-
|
|
|
|
/// size of the table. Now because we bubble up these constraints during the bubble-inline-sizes
|
|
|
|
/// phase of layout, we don't know yet how wide the table is ultimately going to be in the inline
|
|
|
|
/// direction. As we need to pick the maximum width of all cells for a column (in this case, the
|
|
|
|
/// maximum of 100 pixels and 20% of the table), the preceding constraint means that we must
|
|
|
|
/// potentially store both a specified width *and* a specified percentage, so that the inline-size
|
|
|
|
/// assignment phase of layout will know which one to pick.
|
|
|
|
#[deriving(Clone, Encodable, Show)]
|
2014-12-12 04:06:53 +03:00
|
|
|
pub struct ColumnIntrinsicInlineSize {
|
2014-10-15 01:42:32 +04:00
|
|
|
/// The preferred intrinsic inline size.
|
|
|
|
pub preferred: Au,
|
|
|
|
/// The largest specified size of this column as a length.
|
|
|
|
pub minimum_length: Au,
|
|
|
|
/// The largest specified size of this column as a percentage (`width` property).
|
|
|
|
pub percentage: CSSFloat,
|
|
|
|
/// Whether the column inline size is *constrained* per INTRINSIC § 4.1.
|
|
|
|
pub constrained: bool,
|
|
|
|
}
|
|
|
|
|
2014-12-12 04:06:53 +03:00
|
|
|
impl ColumnIntrinsicInlineSize {
|
2014-12-16 05:33:46 +03:00
|
|
|
/// Returns a newly-initialized `ColumnIntrinsicInlineSize` with all fields blank.
|
|
|
|
pub fn new() -> ColumnIntrinsicInlineSize {
|
|
|
|
ColumnIntrinsicInlineSize {
|
|
|
|
preferred: Au(0),
|
|
|
|
minimum_length: Au(0),
|
|
|
|
percentage: 0.0,
|
|
|
|
constrained: false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-15 01:42:32 +04:00
|
|
|
/// Returns the true minimum size of this column, given the containing block's inline size.
|
|
|
|
/// Beware that this is generally only correct for fixed table layout. (Compare CSS 2.1 §
|
|
|
|
/// 17.5.2.1 with the algorithm in INTRINSIC § 4.)
|
|
|
|
pub fn minimum(&self, containing_block_inline_size: Au) -> Au {
|
|
|
|
max(self.minimum_length, containing_block_inline_size.scale_by(self.percentage))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the higher of the two percentages specified in `self` and `other`.
|
2014-12-12 04:06:53 +03:00
|
|
|
pub fn greatest_percentage(&self, other: &ColumnIntrinsicInlineSize) -> CSSFloat {
|
2014-10-15 01:42:32 +04:00
|
|
|
if self.percentage > other.percentage {
|
|
|
|
self.percentage
|
|
|
|
} else {
|
|
|
|
other.percentage
|
|
|
|
}
|
servo: Merge #1973 - Support fixed-layout table and a part of anonymous table object (from june0cho:table_rebase); r=larsbergstrom,metajack
This is a rebase of #1548 on recent master.
There have been many changes since #1548 is first uploaded, so I'm creating new PR.
This PR includes:
- construction of table-* flows (table-wrapper, table-caption, table, table-rowgroup, table-row, table-cell)
- fixed-layout table calculation
- a part of anonymous table object implementation
[CSS 2.1, 17.2.1](http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes) (Step 1-1, 1-2, Step 2)
Source-Repo: https://github.com/servo/servo
Source-Revision: fd5e5cd18b41f0ce2b33fb97fb4e3d75ddbbbceb
2014-03-25 21:40:47 +04:00
|
|
|
}
|
|
|
|
}
|
2014-12-12 04:06:53 +03:00
|
|
|
|
|
|
|
/// The actual inline size for each column.
|
|
|
|
///
|
|
|
|
/// TODO(pcwalton): There will probably be some `border-collapse`-related info in here too
|
|
|
|
/// eventually.
|
|
|
|
#[deriving(Encodable)]
|
|
|
|
pub struct ColumnComputedInlineSize {
|
|
|
|
/// The computed size of this inline column.
|
|
|
|
pub size: Au,
|
|
|
|
}
|