Merge pull request #1537 from win7-7/column-backgrounds-pr-2

Better way to create display items for column backgrounds
author: Moonchild <moonchild@palemoon.org> 2020-05-10 15:02:59 +0200
committer: GitHub <noreply@github.com> 2020-05-10 15:02:59 +0200
commit: 221627575b56e8bb85e8329400da99138f2f67c1 (patch)
tree: 28b0142ae0eedc45e992bb7bacafdc3dba7a15af /layout/reftests
parent: 1659e69dfb075975f366b1e2dbfa145febb2094f (diff)
parent: f9047ff63de90e8c0242a5e7170a8c70f93f99b1 (diff)
download: UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar
UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.gz
UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.lz
UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.xz
UXP-221627575b56e8bb85e8329400da99138f2f67c1.zip
14 files changed, 149 insertions, 16 deletions
diff --git a/layout/reftests/position-relative/1409114-1-ref.html b/layout/reftests/position-relative/1409114-1-ref.html
new file mode 100644
index 000000000..7668cbdef
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-1-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<body>
+<table>
+  <col style="background:green">
+  <tr>
+    <td style="width:20px; height:20px"></td>
+  </tr>
+</table>
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/layout/reftests/position-relative/1409114-1.html b/layout/reftests/position-relative/1409114-1.html
new file mode 100644
index 000000000..1b984ab0c
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-1.html
@@ -0,0 +1,11 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/position-relative/1409114-2.html b/layout/reftests/position-relative/1409114-2.html
new file mode 100644
index 000000000..de18ed40d
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-2.html
@@ -0,0 +1,13 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/position-relative/1409114-3.html b/layout/reftests/position-relative/1409114-3.html
new file mode 100644
index 000000000..3dc66122f
--- /dev/null
+++ b/layout/reftests/position-relative/1409114-3.html
@@ -0,0 +1,13 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/position-relative/reftest.list b/layout/reftests/position-relative/reftest.list
index 880a38e8d..495588ab7 100644
--- a/layout/reftests/position-relative/reftest.list
+++ b/layout/reftests/position-relative/reftest.list
@@ -7,3 +7,6 @@
 == 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 bb03f1525..9ec969236 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,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -55,8 +53,8 @@
 </head>
 <body>
 
-<div class="color o"></div>
-<div class="imagetl o"></div>
+<div class="color"></div>
+<div class="imagetl"></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 7b7df902e..82795ef8b 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,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -55,8 +53,8 @@
 </head>
 <body>
 
-<div class="color o"></div>
-<div class="imagetl o"></div>
+<div class="color"></div>
+<div class="imagetl"></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 ad6ca2453..6985dae64 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,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -65,8 +63,8 @@
 <body>
 
 <div class="color"></div>
-<div class="imagetl o"></div>
-<div class="imagebr o"></div>
+<div class="imagetl"></div>
+<div class="imagebr"></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 e00193dc3..a6629347d 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,8 +10,6 @@
 	html, body { margin: 0; padding: 0; border: 0; font-size: 16px; }
 	body { padding: 15px; }
 
-	.o { opacity: 0.5; }
-
 	/*
 	table { 
 		margin: 0px 3px 2px 4px;
@@ -65,8 +63,8 @@
 <body>
 
 <div class="color"></div>
-<div class="imagetl o"></div>
-<div class="imagebr o"></div>
+<div class="imagetl"></div>
+<div class="imagebr"></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 68dc43e95..a89115ef4 100644
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -60,3 +60,6 @@ fuzzy-if(d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-
 == empty-cells-default-2.html empty-cells-default-2-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
+
+== 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
new file mode 100644
index 000000000..37515fa28
--- /dev/null
+++ b/layout/reftests/table-background/table-col-overlapping-ref.html
@@ -0,0 +1,28 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/table-background/table-col-overlapping.html b/layout/reftests/table-background/table-col-overlapping.html
new file mode 100644
index 000000000..69acab789
--- /dev/null
+++ b/layout/reftests/table-background/table-col-overlapping.html
@@ -0,0 +1,28 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/table-background/table-col-span-1-ref.html b/layout/reftests/table-background/table-col-span-1-ref.html
new file mode 100644
index 000000000..dfe953ea4
--- /dev/null
+++ b/layout/reftests/table-background/table-col-span-1-ref.html
@@ -0,0 +1,15 @@
+<!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>
+\ No newline at end of file
diff --git a/layout/reftests/table-background/table-col-span-1.html b/layout/reftests/table-background/table-col-span-1.html
new file mode 100644
index 000000000..ee9f62d7e
--- /dev/null
+++ b/layout/reftests/table-background/table-col-span-1.html
@@ -0,0 +1,15 @@
+<!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>
+\ No newline at end of file
author	Moonchild <moonchild@palemoon.org>	2020-05-10 15:02:59 +0200
committer	GitHub <noreply@github.com>	2020-05-10 15:02:59 +0200
commit	221627575b56e8bb85e8329400da99138f2f67c1 (patch)
tree	28b0142ae0eedc45e992bb7bacafdc3dba7a15af /layout/reftests
parent	1659e69dfb075975f366b1e2dbfa145febb2094f (diff)
parent	f9047ff63de90e8c0242a5e7170a8c70f93f99b1 (diff)
download	UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.gz UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.lz UXP-221627575b56e8bb85e8329400da99138f2f67c1.tar.xz UXP-221627575b56e8bb85e8329400da99138f2f67c1.zip