summaryrefslogtreecommitdiffstats
path: root/layout/reftests
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-26 20:51:22 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:59:57 +0200
commitdba09fa5c43276bb455cc4da6bd0ec302f798189 (patch)
tree577a2e42181433dea37dfd8febd7879dc66136e6 /layout/reftests
parentafe2b7fa5a576454d3a9b210c708890727243ede (diff)
downloadUXP-dba09fa5c43276bb455cc4da6bd0ec302f798189.tar
UXP-dba09fa5c43276bb455cc4da6bd0ec302f798189.tar.gz
UXP-dba09fa5c43276bb455cc4da6bd0ec302f798189.tar.lz
UXP-dba09fa5c43276bb455cc4da6bd0ec302f798189.tar.xz
UXP-dba09fa5c43276bb455cc4da6bd0ec302f798189.zip
Revert "Issue #1355 - Better way to create display items for column backgrounds"
This reverts commit 44c47c50388f526c2d134e16d5debebe94a0faf8.
Diffstat (limited to 'layout/reftests')
-rw-r--r--layout/reftests/position-relative/1409114-1-ref.html12
-rw-r--r--layout/reftests/position-relative/1409114-1.html11
-rw-r--r--layout/reftests/position-relative/1409114-2.html13
-rw-r--r--layout/reftests/position-relative/1409114-3.html13
-rw-r--r--layout/reftests/position-relative/reftest.list3
-rw-r--r--layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html6
-rw-r--r--layout/reftests/table-background/border-collapse-opacity-table-column-ref.html6
-rw-r--r--layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html6
-rw-r--r--layout/reftests/table-background/border-separate-opacity-table-column-ref.html6
-rw-r--r--layout/reftests/table-background/reftest.list37
-rw-r--r--layout/reftests/table-background/table-col-overlapping-ref.html28
-rw-r--r--layout/reftests/table-background/table-col-overlapping.html28
-rw-r--r--layout/reftests/table-background/table-col-span-1-ref.html15
-rw-r--r--layout/reftests/table-background/table-col-span-1.html15
14 files changed, 31 insertions, 168 deletions
diff --git a/layout/reftests/position-relative/1409114-1-ref.html b/layout/reftests/position-relative/1409114-1-ref.html
deleted file mode 100644
index a2bd3213d..000000000
--- a/layout/reftests/position-relative/1409114-1-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<table>
- <col style="background:green">
- <tr>
- <td style="width:20px; height:20px"></td>
- </tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/reftests/position-relative/1409114-1.html b/layout/reftests/position-relative/1409114-1.html
deleted file mode 100644
index 988ecab1e..000000000
--- a/layout/reftests/position-relative/1409114-1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<table>
- <col style="background:green">
- <tr>
- <td style="position:relative; left:-100px; width:20px; height:20px"></td>
- </tr>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/position-relative/1409114-2.html b/layout/reftests/position-relative/1409114-2.html
deleted file mode 100644
index 6d5e3c617..000000000
--- a/layout/reftests/position-relative/1409114-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body style="overflow:hidden">
-<table style="position:relative; top:-50px">
- <col style="background:green; width: 40px;">
- <tr style="position:relative; left:-100px; height: 40px">
- <td rowspan=2></td>
- </tr>
- <tr style="height: 40px"></tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/reftests/position-relative/1409114-3.html b/layout/reftests/position-relative/1409114-3.html
deleted file mode 100644
index cfd01561d..000000000
--- a/layout/reftests/position-relative/1409114-3.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body style="overflow:hidden">
-<table style="position:relative; top:-50px">
- <tbody style="background:green">
- <tr style="position:relative; left:-100px; height: 40px">
- <td rowspan=2 style="width: 40px;"></td>
- </tr>
- <tr style="height: 40px"></tr>
- </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/position-relative/reftest.list b/layout/reftests/position-relative/reftest.list
index 495588ab7..880a38e8d 100644
--- a/layout/reftests/position-relative/reftest.list
+++ b/layout/reftests/position-relative/reftest.list
@@ -7,6 +7,3 @@
== table-separate-3.html table-separate-3-ref.html
== table-separate-4.html table-separate-4-ref.html
== 1115999-1.html 1115999-1-ref.html
-== 1409114-1.html 1409114-1-ref.html
-!= 1409114-2.html about:blank
-!= 1409114-3.html about:blank
diff --git a/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html b/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
index 9ec969236..bb03f1525 100644
--- a/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
+++ b/layout/reftests/table-background/border-collapse-opacity-table-column-group-ref.html
@@ -10,6 +10,8 @@
html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
body { padding: 15px; }
+ .o { opacity: 0.5; }
+
/*
table {
margin: 0px 3px 2px 4px;
@@ -53,8 +55,8 @@
</head>
<body>
-<div class="color"></div>
-<div class="imagetl"></div>
+<div class="color o"></div>
+<div class="imagetl o"></div>
<div class="imagebr"></div>
</body>
diff --git a/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html b/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
index 82795ef8b..7b7df902e 100644
--- a/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
+++ b/layout/reftests/table-background/border-collapse-opacity-table-column-ref.html
@@ -10,6 +10,8 @@
html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
body { padding: 15px; }
+ .o { opacity: 0.5; }
+
/*
table {
margin: 0px 3px 2px 4px;
@@ -53,8 +55,8 @@
</head>
<body>
-<div class="color"></div>
-<div class="imagetl"></div>
+<div class="color o"></div>
+<div class="imagetl o"></div>
<div class="imagebr"></div>
</body>
diff --git a/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html b/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
index 6985dae64..ad6ca2453 100644
--- a/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
+++ b/layout/reftests/table-background/border-separate-opacity-table-column-group-ref.html
@@ -10,6 +10,8 @@
html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
body { padding: 15px; }
+ .o { opacity: 0.5; }
+
/*
table {
margin: 0px 3px 2px 4px;
@@ -63,8 +65,8 @@
<body>
<div class="color"></div>
-<div class="imagetl"></div>
-<div class="imagebr"></div>
+<div class="imagetl o"></div>
+<div class="imagebr o"></div>
<div class="hstripe" style="top: 46px"></div>
<div class="hstripe" style="top: 70px"></div>
diff --git a/layout/reftests/table-background/border-separate-opacity-table-column-ref.html b/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
index a6629347d..e00193dc3 100644
--- a/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
+++ b/layout/reftests/table-background/border-separate-opacity-table-column-ref.html
@@ -10,6 +10,8 @@
html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
body { padding: 15px; }
+ .o { opacity: 0.5; }
+
/*
table {
margin: 0px 3px 2px 4px;
@@ -63,8 +65,8 @@
<body>
<div class="color"></div>
-<div class="imagetl"></div>
-<div class="imagebr"></div>
+<div class="imagetl o"></div>
+<div class="imagebr o"></div>
<div class="hstripe" style="top: 46px"></div>
<div class="hstripe" style="top: 70px"></div>
diff --git a/layout/reftests/table-background/reftest.list b/layout/reftests/table-background/reftest.list
index 727a7de08..68dc43e95 100644
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -40,30 +40,23 @@ asserts-if(gtkWidget,0-6) != backgr_border-table-quirks.html empty.html
== border-collapse-table-row-group.html border-collapse-table-row-group-ref.html
== border-collapse-table-row.html border-collapse-table-row-ref.html
== border-collapse-table.html border-collapse-table-ref.html
-fuzzy-if(d2d,0-1,0-1083) fuzzy-if(skiaContent,0-1,0-2200) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell-ref.html
-fuzzy-if(d2d,0-1,0-33174) fuzzy-if(skiaContent,0-1,0-16863) == border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group-ref.html
-fuzzy-if(d2d,0-1,0-11058) fuzzy-if(skiaContent,0-1,0-5625) == border-collapse-opacity-table-column.html border-collapse-opacity-table-column-ref.html
-fuzzy-if(d2d,0-1,0-24606) fuzzy-if(skiaContent,0-1,0-17000) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group-ref.html
-fuzzy-if(d2d,0-1,0-11000) fuzzy-if(skiaContent,0-1,0-11000) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row-ref.html
-fuzzy-if(d2d||skiaContent,0-1,0-60000) == border-collapse-opacity-table.html border-collapse-opacity-table-ref.html
-fuzzy-if(d2d,0-1,0-2478) fuzzy-if(skiaContent,0-1,0-2500) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell-ref.html
-fuzzy-if(d2d,0-1,0-38000) == border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group-ref.html
-fuzzy-if(d2d,0-1,0-13000) == border-separate-opacity-table-column.html border-separate-opacity-table-column-ref.html
-fuzzy-if(d2d,0-1,0-37170) fuzzy-if(skiaContent,0-1,0-38000) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group-ref.html
-fuzzy-if(d2d,0-1,0-12390) fuzzy-if(skiaContent,0-1,0-13000) == border-separate-opacity-table-row.html border-separate-opacity-table-row-ref.html
-fuzzy-if(d2d||skiaContent,0-1,0-95000) == border-separate-opacity-table.html border-separate-opacity-table-ref.html
-!= scrollable-rowgroup-collapse-background.html scrollable-rowgroup-collapse-notref.html
-!= scrollable-rowgroup-collapse-border.html scrollable-rowgroup-collapse-notref.html
+fuzzy-if(d2d,1,1083) fuzzy-if(skiaContent,1,2200) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell-ref.html
+fails == border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group-ref.html # bug 424274
+fails == border-collapse-opacity-table-column.html border-collapse-opacity-table-column-ref.html # bug 424274
+fuzzy-if(d2d,1,16359) fuzzy-if(skiaContent,1,17000) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group-ref.html
+fuzzy-if(d2d,1,11000) fuzzy-if(skiaContent,1,11000) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row-ref.html
+fuzzy-if(d2d||skiaContent,1,60000) == border-collapse-opacity-table.html border-collapse-opacity-table-ref.html
+fuzzy-if(d2d,1,2478) fuzzy-if(skiaContent,1,2500) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell-ref.html
+fuzzy-if(d2d,1,38000) == border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group-ref.html # bug 424274
+fuzzy-if(d2d,1,13000) == border-separate-opacity-table-column.html border-separate-opacity-table-column-ref.html # bug 424274
+fuzzy-if(d2d,1,37170) fuzzy-if(skiaContent,1,38000) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group-ref.html
+fuzzy-if(d2d,1,12390) fuzzy-if(skiaContent,1,13000) == border-separate-opacity-table-row.html border-separate-opacity-table-row-ref.html
+fuzzy-if(d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-separate-opacity-table-ref.html
+!= scrollable-rowgroup-collapse-background.html scrollable-rowgroup-collapse-notref.html
+!= scrollable-rowgroup-collapse-border.html scrollable-rowgroup-collapse-notref.html
!= scrollable-rowgroup-separate-background.html scrollable-rowgroup-separate-notref.html
== scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-notref.html # scrolling rowgroups were removed in bug 28800
== empty-cells-default-1.html empty-cells-default-1-ref.html
== empty-cells-default-2.html empty-cells-default-2-ref.html
-fuzzy-if(OSX,0-1,0-113) fuzzy-if(winWidget,0-1,0-12) fuzzy-if(winWidget&&!layersGPUAccelerated,0-82,0-116) fuzzy-if(skiaContent,0-84,0-5500) fuzzy-if(Android,0-2,0-5957) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
+fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(Android,1,39) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,84,5500) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
== table-row-opacity-dynamic-2.html table-row-opacity-dynamic-2-ref.html
-
-== hidden-cells-1.html about:blank
-== hidden-cells-2.html about:blank
-== hidden-cells-3.html hidden-cells-3-ref.html
-
-== table-col-overlapping.html table-col-overlapping-ref.html
-== table-col-span-1.html table-col-span-1-ref.html
diff --git a/layout/reftests/table-background/table-col-overlapping-ref.html b/layout/reftests/table-background/table-col-overlapping-ref.html
deleted file mode 100644
index 06b6c3e06..000000000
--- a/layout/reftests/table-background/table-col-overlapping-ref.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
- td {
- width: 20px;
- height: 20px;
- background-color: green;
- }
- table {
- border-collapse:separate;
- border-spacing: 0px;
- }
-</style>
-</head>
-<body>
-<table>
- <tr>
- <td></td>
- <td style="background-color: blue"></td>
- <tr>
- <td></td>
- <td></td>
- </tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/reftests/table-background/table-col-overlapping.html b/layout/reftests/table-background/table-col-overlapping.html
deleted file mode 100644
index c50f1654f..000000000
--- a/layout/reftests/table-background/table-col-overlapping.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
- td {
- width: 20px;
- height: 20px;
- }
- table {
- border-collapse:separate;
- border-spacing: 0px;
- }
-</style>
-</head>
-<body>
-<table>
- <col style="background: green"></col>
- <col style="background: blue"></col>
- <tr>
- <td></td>
- <td rowspan=2></td>
- <tr>
- <td colspan=2></td>
- </tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/reftests/table-background/table-col-span-1-ref.html b/layout/reftests/table-background/table-col-span-1-ref.html
deleted file mode 100644
index 12a7bc45f..000000000
--- a/layout/reftests/table-background/table-col-span-1-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
- <table border>
- <col style="background:purple"></col>
- <col style="background:purple"></col>
- <col style="background:blue"></col>
- <tr>
- <td>x</td>
- <td>y</td>
- <td>z</td>
- </tr>
- </table>
-</body>
-</html>
diff --git a/layout/reftests/table-background/table-col-span-1.html b/layout/reftests/table-background/table-col-span-1.html
deleted file mode 100644
index 7fd21ce06..000000000
--- a/layout/reftests/table-background/table-col-span-1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
- <table border>
- <col span=2 style="background:purple"></col>
- <col style="background:blue"></col>
- <tr>
- <td>x</td>
- <td>y</td>
- <td>z</td>
- </tr>
- </table>
-</body>
-
-</html>