[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:02:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1e0d705a41ce348de499920f26f7454be0fc8997
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 17 23:06:54 2003 +0000
Add border-collapsing tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/table/border-collapsing/001-expected.txt b/LayoutTests/fast/table/border-collapsing/001-expected.txt
new file mode 100644
index 0000000..b1a208c
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/001-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x366
+ RenderBlock {HTML} at (0,0) size 800x366
+ RenderBody {BODY} at (8,8) size 784x350
+ RenderBlock {DIV} at (0,0) size 784x187
+ RenderTable {TABLE} at (10,10) size 312x167
+ RenderTableSection {TBODY} at (0,0) size 0x167
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 312x39 [r=0 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (6,6) size 35x17
+ text run at (6,6) width 35: "Hello"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,39) size 312x59 [r=1 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (16,16) size 61x17
+ text run at (16,16) width 61: "Goodbye"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,98) size 312x69 [r=2 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (26,26) size 61x17
+ text run at (26,26) width 61: "Goodbye"
+ RenderBlock {DIV} at (0,327) size 784x23
+ RenderTable {TABLE} at (1,1) size 34x21
+ RenderTableSection {TBODY} at (0,0) size 0x21
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 34x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (2,2) size 30x17
+ text run at (2,2) width 30: "Test"
diff --git a/LayoutTests/fast/table/border-collapsing/001.html b/LayoutTests/fast/table/border-collapsing/001.html
new file mode 100644
index 0000000..db7ab81
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/001.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+
+<html>
+<div style="border:10px dotted blue">
+<table style="border-collapse:collapse; border:2px solid red">
+<tr><td width=300 style="border:10px solid green">Hello
+<tr><td style="border:30px solid blue">Goodbye
+<tr><td style="border:50px solid red">Goodbye
+</table>
+</div>
+
+
+<div style="border:1px solid green; margin-top:10em">
+<table style="border-collapse:collapse;"><tr><td style="border:2px solid black">Test</td></tr></table>
+</div>
diff --git a/LayoutTests/fast/table/border-collapsing/002-expected.txt b/LayoutTests/fast/table/border-collapsing/002-expected.txt
new file mode 100644
index 0000000..bac6159
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/002-expected.txt
@@ -0,0 +1,61 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x264
+ RenderBlock {HTML} at (0,0) size 800x264
+ RenderBody {BODY} at (8,8) size 784x242
+ RenderBlock {P} at (0,0) size 784x242
+ RenderTable {TABLE} at (0,0) size 147x242
+ RenderTableCol {COL} at (0,0) size 0x0
+ RenderTableCol {COL} at (0,0) size 0x0
+ RenderTableCol {COL} at (0,0) size 0x0
+ RenderTableSection {TBODY} at (0,0) size 0x242
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,1) size 50x48 [r=0 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (17,17) size 9x17
+ text run at (17,17) width 9: "1"
+ RenderTableCell {TD} at (50,0) size 48x50 [r=0 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (16,17) size 9x17
+ text run at (16,17) width 9: "2"
+ RenderTableCell {TD} at (98,0) size 49x50 [r=0 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (15,17) size 9x17
+ text run at (15,17) width 9: "3"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,52) size 50x46 [r=1 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (17,15) size 9x17
+ text run at (17,15) width 9: "4"
+ RenderTableCell {TD} at (50,50) size 48x50 [r=1 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (17,17) size 9x17
+ text run at (17,17) width 9: "5"
+ RenderTableCell {TD} at (98,50) size 49x50 [r=1 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (17,17) size 9x17
+ text run at (17,17) width 9: "6"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,101) size 50x46 [r=2 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (17,15) size 9x17
+ text run at (17,15) width 9: "7"
+ RenderTableCell {TD} at (50,100) size 48x48 [r=2 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (16,17) size 9x17
+ text run at (16,17) width 9: "8"
+ RenderTableCell {TD} at (98,100) size 49x48 [r=2 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (15,17) size 9x17
+ text run at (15,17) width 9: "9"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,148) size 50x46 [r=3 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (17,15) size 18x17
+ text run at (17,15) width 18: "10"
+ RenderTableCell {TD} at (50,148) size 48x46 [r=3 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (16,15) size 18x17
+ text run at (16,15) width 18: "11"
+ RenderTableCell {TD} at (98,148) size 49x46 [r=3 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (15,15) size 18x17
+ text run at (15,15) width 18: "12"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,194) size 50x48 [r=4 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (17,15) size 18x17
+ text run at (17,15) width 18: "13"
+ RenderTableCell {TD} at (50,194) size 48x48 [r=4 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (16,15) size 18x17
+ text run at (16,15) width 18: "14"
+ RenderTableCell {TD} at (98,194) size 49x48 [r=4 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (15,15) size 18x17
+ text run at (15,15) width 18: "15"
diff --git a/LayoutTests/fast/table/border-collapsing/002.html b/LayoutTests/fast/table/border-collapsing/002.html
new file mode 100644
index 0000000..b2b3834
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/002.html
@@ -0,0 +1,44 @@
+<html>
+<head>
+<style>
+table { border-collapse: collapse;
+ border: 5px solid yellow; }
+*#col1 { border: 3px solid black; }
+td { border: 1px solid red; padding: 1em; }
+td.solid-blue { border: 5px dashed blue; }
+td.solid-green { border: 5px solid green; }
+</style>
+</head>
+<body>
+<P>
+<TABLE>
+<COL id="col1"><COL id="col2"><COL id="col3">
+<TR id="row1">
+ <TD> 1
+ <TD> 2
+ <TD> 3
+</TR>
+<TR id="row2">
+ <TD> 4
+ <TD class="solid-blue"> 5
+ <TD class="solid-green"> 6
+</TR>
+<TR id="row3">
+ <TD> 7
+ <TD> 8
+ <TD> 9
+</TR>
+<TR id="row4">
+ <TD> 10
+ <TD> 11
+ <TD> 12
+</TR>
+<TR id="row5">
+ <TD> 13
+ <TD> 14
+ <TD> 15
+</TR>
+</table>
+</p>
+</body>
+</html>
diff --git a/LayoutTests/fast/table/border-collapsing/003-expected.txt b/LayoutTests/fast/table/border-collapsing/003-expected.txt
new file mode 100644
index 0000000..a7f6105
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/003-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x311
+ RenderBlock {HTML} at (0,0) size 800x311
+ RenderBody {BODY} at (8,14) size 784x269
+ RenderBlock {P} at (0,0) size 784x17
+ RenderText {TEXT} at (0,0) size 594x17
+ text run at (0,0) width 483: "The black border below should cut right through the top left corner of "
+ text run at (483,0) width 111: "the blue border."
+ RenderBlock {DIV} at (28,45) size 728x224
+ RenderTable {DIV} at (1,1) size 96x180
+ RenderTableSection at (0,0) size 0x180
+ RenderTableRow {P} at (0,0) size 0x0
+ RenderTableCell {SPAN} at (0,9) size 48x11 [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {SPAN} at (48,0) size 48x62 [r=0 c=1 rs=1 cs=1]
+ RenderTableRow {P} at (0,0) size 0x0
+ RenderTableCell {SPAN} at (0,90) size 48x20 [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {SPAN} at (48,90) size 48x62 [r=1 c=1 rs=1 cs=1]
diff --git a/LayoutTests/fast/table/border-collapsing/003.html b/LayoutTests/fast/table/border-collapsing/003.html
new file mode 100644
index 0000000..065713b
--- /dev/null
+++ b/LayoutTests/fast/table/border-collapsing/003.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+ <head>
+ <title>Border Collapsing Test</title>
+ <style type="text/css">
+ .b { border: solid thin blue; padding: 0 0 3em 0; margin: 2em; }
+ .t { display: table; border-collapse: collapse; }
+ .r { display: table-row; }
+ .c { display: table-cell; border: solid 20px; height: 2em; width: 2em; }
+ .r.a > .c.a { border-width: 2px; }
+ </style>
+ </head>
+ <body>
+ <p>The black border below should cut right through the top left corner of
+ the blue border.</p>
+ <div class="b">
+ <div class="t">
+ <p class="r a"> <span class="c a"></span> <span class="c b"></span> </p>
+ <p class="r b"> <span class="c a"></span> <span class="c b"></span> </p>
+ </div>
+ </div>
+ </body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list