mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 573960 - Make the bordercolor attribute on table elements work again; r=bernd a=blocking-betaN+

This commit is contained in:
Ehsan Akhgari 2011-01-31 16:23:01 -05:00
Родитель acc39dcb6f
Коммит a9128640d0
15 изменённых файлов: 350 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
layout/reftests/table-bordercollapse/bordercolor-1.html Normal file
Просмотреть файл

@ -0,0 +1,17 @@
<!doctype html public "-//w3c//dtd html 3.2//en">
<html>
<head>
<title>bordercolor</title>
</head>
<body >
<table border="1" bordercolor="green">
<tr><td>c1</td></tr>
</table>
</body>
</html>

2
layout/reftests/table-bordercollapse/bordercolor.html → layout/reftests/table-bordercollapse/bordercolor-2.html
Просмотреть файл

@ -7,7 +7,7 @@
</head>
<body >
<table bordercolor="green">
<table border="1" bordercolor="blue">
<tr><td>c1</td></tr>
</table>

57
layout/reftests/table-bordercollapse/bordercolor-3-ref.html Normal file
Просмотреть файл

@ -0,0 +1,57 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html >
<head>
<title>CSS Test: HTML bordercolor Attribute</title>
<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
<link rel="help" href="RELEVANT_SPEC_SECTION"/>
<meta name="assert" content="Figure out which rules are ignored and how."/>
<style type="text/css">
html { color: blue; }
table { margin: 0.5em; }
.thin, .elemthin { border-width: thin; border-style: outset; }
.thin * { border-width: thin; border-style: inset; }
.orange, .orange *, .elemorange { border-color: orange; }
</style>
</head>
<body>
<table class="orange thin">
<tr><td>A<td>A
</table>
<table class="elemorange elemthin">
<tr><td>B<td>B
</table>
<table class=orange style="border-collapse: collapse;">
<tr><td style="border-right-width: thin; border-right-style: solid;
border-bottom-width: thin; border-bottom-style: solid;">C
<td style="border-bottom-width: thin; border-bottom-style: solid;">C
<tr><td style="border-right-width: thin; border-right-style: solid;">C<td>C
</table>
<table class=orange style="border-collapse: collapse;">
<tr><td style="border-right-width: thin; border-right-style: solid;">D<td>D
<tr><td style="border-right-width: thin; border-right-style: solid;">D<td>D
</table>
<table>
<tr><td>E<td>E
<tr><td>E<td>E
</table>
<table>
<tr><td>F<td>F
</table>
<table style="border-collapse: collapse;">
<tr class=orange><td style="border-right-width: thin; border-right-style: solid;
border-bottom-width: thin; border-bottom-style: solid;">G
<td style="border-bottom-width: thin; border-bottom-style: solid;">G
<tr class=orange><td style="border-right-width: thin; border-right-style: solid;">G<td>G
</table>
<table class="elemorange thin">
<tr><td>H<td>H
</table>
</body>
</html>

51
layout/reftests/table-bordercollapse/bordercolor-3.html Normal file
Просмотреть файл

@ -0,0 +1,51 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html >
<head>
<title>CSS Test: HTML bordercolor Attribute</title>
<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
<link rel="help" href="RELEVANT_SPEC_SECTION"/>
<meta name="assert" content="Figure out which rules are ignored and how."/>
<style type="text/css">
html { color: lime; }
table { margin: 0.5em; }
td { color: blue; }
</style>
</head>
<body>
<table bordercolor=orange border>
<tr><td>A<td>A
</table>
<table bordercolor=orange frame=border>
<tr><td>B<td>B
</table>
<table bordercolor=orange rules=all>
<tr><td>C<td>C
<tr><td>C<td>C
</table>
<table bordercolor=orange rules=cols>
<tr><td>D<td>D
<tr><td>D<td>D
</table>
<table bordercolor=orange rules=none>
<tr><td>E<td>E
<tr><td>E<td>E
</table>
<table bordercolor=orange>
<tr><td>F<td>F
</table>
<table bordercolor=orange rules=all frame=none>
<tr><td>G<td>G
<tr><td>G<td>G
</table>
<table style="border-color: orange;" border>
<tr><td>H<td>H
</table>
</body>
</html>

59
layout/reftests/table-bordercollapse/bordercolor-4-ref.html Normal file
Просмотреть файл

@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
/* just to improve vissibility */
td {
border-width: 3px;
border-style: solid;
}
</style>
</head>
<body>
<table border="5" style="border-color:blue;">
<caption>TABLE with CSS border-color:blue</caption>
<tr>
<td style="border-color: black;">Row 1</td>
</tr>
<tr>
<td style="color:red; border-color: red;">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
<br>
<table border="5" style="border-color: orange;">
<caption>TABLE with HTML bordercolor attribute=orange</caption>
<tr>
<td style="border-color: orange">Row 1</td>
</tr>
<tr>
<td style="color:red; border-color: orange">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
<br>
<table border="5" style="border-color:blue;">
<caption>TABLE with CSS border-color:blue and HTML bordercolor attribute=orange</caption>
<tr>
<td style="border-color: blue;">Row 1</td>
</tr>
<tr>
<td style="color:red; border-color: blue;">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
</body>
</html>

59
layout/reftests/table-bordercollapse/bordercolor-4.html Normal file
Просмотреть файл

@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
/* just to improve vissibility */
td {
border-width: 3px;
border-style: solid;
}
</style>
</head>
<body>
<table border="5" style="border-color:blue;">
<caption>TABLE with CSS border-color:blue</caption>
<tr>
<td>Row 1</td>
</tr>
<tr>
<td style="color:red">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
<br>
<table border="5" bordercolor="orange">
<caption>TABLE with HTML bordercolor attribute=orange</caption>
<tr>
<td>Row 1</td>
</tr>
<tr>
<td style="color:red">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
<br>
<table border="5" bordercolor="orange" style="border-color:blue;">
<caption>TABLE with CSS border-color:blue and HTML bordercolor attribute=orange</caption>
<tr>
<td>Row 1</td>
</tr>
<tr>
<td style="color:red">Row 2</td>
</tr>
<tr>
<td style="border-color:green">Row 3</td>
</tr>
</table>
</body>
</html>

22
layout/reftests/table-bordercollapse/bordercolor-ref.html Normal file
Просмотреть файл

@ -0,0 +1,22 @@
<!doctype html public "-//w3c//dtd html 3.2//en">
<html>
<head>
<title>bordercolor</title>
<style>
table, td {
border-color: green;
}
</style>
</head>
<body >
<table border="1" bordercolor="blue">
<tr><td>c1</td></tr>
</table>
</body>
</html>

1
layout/reftests/table-bordercollapse/borderhandling-8.html
Просмотреть файл

@ -1,3 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">

1
layout/reftests/table-bordercollapse/borderhandling-frame-border-ref.html
Просмотреть файл

@ -1,3 +1,4 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">

3
layout/reftests/table-bordercollapse/borderhandling-frame-border.html
Просмотреть файл

@ -1,3 +1,4 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
@ -99,4 +100,4 @@ div {width: 3px; height: 3px;}
</table>
</body>
</html>
</html>

34
layout/reftests/table-bordercollapse/borderhandling-rules-border-ref.html
Просмотреть файл

@ -4,12 +4,12 @@
<style>
div {width: 3px; height: 3px;}
div {width: 3px; height: 3px;}
table.frame {border: outset thin ;}
table.frame {border-style: outset; border-width: thin ;}
table.bc{ border-collapse:collapse; border-style: hidden}
.bcborder {border: 1px solid}
td.inner {border: inset thin;}
table.inner td {border: inset thin;}
.bcborder {border-width: 1px; border-style: solid}
td.inner {border-style: inset; border-width: thin;}
table.inner td {border-style: inset; border-width: thin;}
</style>
</head>
<body>
@ -137,7 +137,7 @@ table.inner td {border: inset thin;}
<tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup class="bcborder"><col><col></colgroup>
<colgroup class="bcborder"><col></colgroup>
<thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -151,14 +151,14 @@ table.inner td {border: inset thin;}
<tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup class="bcborder"><col><col></colgroup>
<colgroup class="bcborder"><col></colgroup>
<thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
<tfoot class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 3px outset">
<td><table class="bc" style="border-width: 3px; border-style: outset">
<colgroup class="bcborder"><col><col></colgroup>
<colgroup class="bcborder"><col></colgroup>
<thead class="bcborder"><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -180,7 +180,7 @@ table.inner td {border: inset thin;}
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col><col></colgroup>
<colgroup><col></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -194,14 +194,14 @@ table.inner td {border: inset thin;}
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col><col></colgroup>
<colgroup><col></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 3px outset">
<td><table class="bc" style="border-width: 3px; border-style: outset">
<colgroup><col><col></colgroup>
<colgroup><col></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -219,7 +219,7 @@ table.inner td {border: inset thin;}
<tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table table class="bc" style="border: 1px solid">
<td><table table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -233,14 +233,14 @@ table.inner td {border: inset thin;}
<tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table table class="bc" style="border: 1px solid">
<td><table table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
<tfoot><tr><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr><td><div/></td><td><div/></td><td><div/></td></tr><tr><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table table class="bc" style="border: 3px outset">
<td><table table class="bc" style="border-width: 3px; border-style: outset">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -258,7 +258,7 @@ table.inner td {border: inset thin;}
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -272,14 +272,14 @@ table.inner td {border: inset thin;}
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 1px solid">
<td><table class="bc" style="border-width: 1px; border-style: solid">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
<tfoot><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tfoot>
<tbody><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></tbody>
</table></td>
<td><table class="bc" style="border: 3px outset">
<td><table class="bc" style="border-width: 3px; border-style: outset">
<colgroup><col class="bcborder"><col class="bcborder"></colgroup>
<colgroup><col class="bcborder"></colgroup>
<thead><tr class="bcborder"><td><div/></td><td><div/></td><td><div/></td></tr></thead>
@ -290,4 +290,4 @@ table.inner td {border: inset thin;}
</table>
</body>
</html>
</html>

12
layout/reftests/table-bordercollapse/borderhandling-strict-ref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<style>
div {width: 50px; height: 50px;}
</style>
</head>
<body>
<table border=1><tbody><tr><td><div/></td></tr></tbody></table>
</body>
</html>

12
layout/reftests/table-bordercollapse/reftest.list
Просмотреть файл

@ -69,9 +69,13 @@ fails-if(cocoaWidget) == bc_borderoffset2.html bc_borderoffset2_ref.html # bug 4
== borderhandling-2.html borderhandling-ref.html
== borderhandling-3.html borderhandling-ref.html
== borderhandling-4.html borderhandling-ref.html
== borderhandling-5.xhtml borderhandling-ref.html
== borderhandling-6.xhtml borderhandling-ref.html
== borderhandling-7.xhtml borderhandling-ref.html
== borderhandling-8.html borderhandling-ref.html
== borderhandling-5.xhtml borderhandling-strict-ref.html
== borderhandling-6.xhtml borderhandling-strict-ref.html
== borderhandling-7.xhtml borderhandling-strict-ref.html
== borderhandling-8.html borderhandling-strict-ref.html
== borderhandling-frame-border.html borderhandling-frame-border-ref.html
random == borderhandling-rules-border.html borderhandling-rules-border-ref.html # bug 540360 (depends on bug 540256)
== bordercolor-1.html bordercolor-ref.html
!= bordercolor-2.html bordercolor-ref.html
== bordercolor-3.html bordercolor-3-ref.html
== bordercolor-4.html bordercolor-4-ref.html

56
layout/style/html.css
Просмотреть файл

@ -287,7 +287,8 @@ table[align="right"] {
/* Put this first so 'border' and 'frame' rules can override it. */
table[rules] {
border: thin hidden;
border-width: thin;
border-style: hidden;
}
/* 'border' before 'frame' so 'frame' overrides
@ -298,7 +299,8 @@ table[rules] {
also checks for other zero-like values according to HTML attribute
parsing rules */
table:-moz-table-border-nonzero {
border: thin outset;
border-width: thin;
border-style: outset;
}
table[frame] {
@ -328,7 +330,8 @@ table:-moz-table-border-nonzero > * > th,
table:-moz-table-border-nonzero > td,
table:-moz-table-border-nonzero > th
{
border: thin inset;
border-width: thin;
border-style: inset;
}
/* collapse only if rules are really specified */
@ -345,7 +348,8 @@ table[rules]:not([rules=""])> * > tr > th,
table[rules]:not([rules=""])> td,
table[rules]:not([rules=""])> th
{
border: thin none;
border-width: thin;
border-style: none;
}
@ -356,7 +360,8 @@ table[rules][rules="none"] > * > tr > th,
table[rules][rules="none"] > td,
table[rules][rules="none"] > th
{
border: thin hidden;
border-width: thin;
border-style: hidden;
}
table[rules][rules="all"] > tr > td,
@ -366,13 +371,16 @@ table[rules][rules="all"] > * > tr > th,
table[rules][rules="all"] > td,
table[rules][rules="all"] > th
{
border: thin solid ;
border-width: thin;
border-style: solid;
}
table[rules][rules="rows"] > tr,
table[rules][rules="rows"] > * > tr {
border-top: thin solid;
border-bottom: thin solid;
border-top-width: thin;
border-bottom-width: thin;
border-top-style: solid;
border-bottom-style: solid;
}
@ -380,19 +388,25 @@ table[rules][rules="cols"] > tr > td,
table[rules][rules="cols"] > * > tr > td,
table[rules][rules="cols"] > tr > th,
table[rules][rules="cols"] > * > tr > th {
border-left: thin solid;
border-right: thin solid;
border-left-width: thin;
border-right-width: thin;
border-left-style: solid;
border-right-style: solid;
}
table[rules][rules="groups"] > colgroup {
border-left: thin solid;
border-right: thin solid;
border-left-width: thin;
border-right-width: thin;
border-left-style: solid;
border-right-style: solid;
}
table[rules][rules="groups"] > tfoot,
table[rules][rules="groups"] > thead,
table[rules][rules="groups"] > tbody {
border-top: thin solid;
border-bottom: thin solid;
border-top-width: thin;
border-bottom-width: thin;
border-top-style: solid;
border-bottom-style: solid;
}
@ -470,6 +484,20 @@ table > form:-moz-is-html {
display: none !important;
}
table[bordercolor] > tbody,
table[bordercolor] > thead,
table[bordercolor] > tfoot,
table[bordercolor] > col,
table[bordercolor] > colgroup,
table[bordercolor] > tr,
table[bordercolor] > * > tr,
table[bordercolor] > tr > td,
table[bordercolor] > * > tr > td,
table[bordercolor] > tr > th,
table[bordercolor] > * > tr > th {
border-color: inherit;
}
/* inlines */
q:before {

2
layout/style/quirk.css
Просмотреть файл

@ -96,7 +96,7 @@ table {
* Make table borders gray for compatibility with what other browsers do
* in all modes, rather than using the foreground color.
*/
table, td, th {
table, td, th, tr, thead, tbody, tfoot, colgroup, col {
border-color: gray;
}