mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #11352 - ConnorGBrewster:colspan_spacing, r=pcwalton
Fixed colspan not including cell spacing Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy --faster` does not report any errors - [X] These changes fix #11351 (github issue number if applicable). Either: - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11352) <!-- Reviewable:end -->
This commit is contained in:
commit
7b467ee52d
4 changed files with 88 additions and 1 deletions
|
@ -357,7 +357,7 @@ impl Flow for TableRowFlow {
|
|||
None => break,
|
||||
};
|
||||
column_computed_inline_size.size = column_computed_inline_size.size +
|
||||
extra_column_computed_inline_size.size;
|
||||
extra_column_computed_inline_size.size + self.spacing.horizontal;
|
||||
}
|
||||
|
||||
computed_inline_size_for_cells.push(column_computed_inline_size)
|
||||
|
|
|
@ -4756,6 +4756,18 @@
|
|||
"url": "/_mozilla/css/table_colspan_simple_a.html"
|
||||
}
|
||||
],
|
||||
"css/table_colspan_spacing_a.html": [
|
||||
{
|
||||
"path": "css/table_colspan_spacing_a.html",
|
||||
"references": [
|
||||
[
|
||||
"/_mozilla/css/table_colspan_spacing_ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
"url": "/_mozilla/css/table_colspan_spacing_a.html"
|
||||
}
|
||||
],
|
||||
"css/table_containing_block_a.html": [
|
||||
{
|
||||
"path": "css/table_containing_block_a.html",
|
||||
|
@ -11568,6 +11580,18 @@
|
|||
"url": "/_mozilla/css/table_colspan_simple_a.html"
|
||||
}
|
||||
],
|
||||
"css/table_colspan_spacing_a.html": [
|
||||
{
|
||||
"path": "css/table_colspan_spacing_a.html",
|
||||
"references": [
|
||||
[
|
||||
"/_mozilla/css/table_colspan_spacing_ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
"url": "/_mozilla/css/table_colspan_spacing_a.html"
|
||||
}
|
||||
],
|
||||
"css/table_containing_block_a.html": [
|
||||
{
|
||||
"path": "css/table_containing_block_a.html",
|
||||
|
|
26
tests/wpt/mozilla/tests/css/table_colspan_spacing_a.html
Normal file
26
tests/wpt/mozilla/tests/css/table_colspan_spacing_a.html
Normal file
|
@ -0,0 +1,26 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<link rel='match' href='table_colspan_spacing_ref.html'>
|
||||
<style>
|
||||
td[colspan="2"] {
|
||||
background-color: blue;
|
||||
color: white;
|
||||
}
|
||||
td[colspan="3"] {
|
||||
background-color: green;
|
||||
color: white;
|
||||
}
|
||||
td {
|
||||
height: 23px;
|
||||
padding: 0;
|
||||
}
|
||||
</style>
|
||||
<body>
|
||||
<table border=0 cellspacing=1 cellpadding=0>
|
||||
<tr><td width=100> </td><td width=100> </td><td width=100> </td></tr>
|
||||
<tr><td colspan=2> </td><td> </td></tr>
|
||||
<tr><td> <td colspan=2> </td></tr>
|
||||
<tr><td colspan=3> </td></tr>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
37
tests/wpt/mozilla/tests/css/table_colspan_spacing_ref.html
Normal file
37
tests/wpt/mozilla/tests/css/table_colspan_spacing_ref.html
Normal file
|
@ -0,0 +1,37 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<style>
|
||||
.table {
|
||||
padding-left: 1px;
|
||||
}
|
||||
.row {
|
||||
height: 23px;
|
||||
margin-top: 1px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
.row-0 {
|
||||
height: 24px;
|
||||
}
|
||||
.row-1 {
|
||||
width: 201px;
|
||||
background-color: blue;
|
||||
}
|
||||
.row-2 {
|
||||
margin-left: 101px;
|
||||
width: 201px;
|
||||
background-color: blue;
|
||||
}
|
||||
.row-3 {
|
||||
width: 302px;
|
||||
background-color: green;
|
||||
}
|
||||
</style>
|
||||
<body>
|
||||
<div class="table">
|
||||
<div class="row row-0"></div>
|
||||
<div class="row row-1"></div>
|
||||
<div class="row row-2"></div>
|
||||
<div class="row row-3"></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
Loading…
Add table
Add a link
Reference in a new issue