[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:35:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 30a901d63b274dc18e611aa2b9e87b203e314235
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 22 02:26:24 2004 +0000
Add layout test for weird rowspan case.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6445 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/table/rowspan-paint-order-expected.txt b/LayoutTests/fast/table/rowspan-paint-order-expected.txt
new file mode 100644
index 0000000..c3a7410
--- /dev/null
+++ b/LayoutTests/fast/table/rowspan-paint-order-expected.txt
@@ -0,0 +1,59 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x119
+ RenderBlock {HTML} at (0,0) size 800x119
+ RenderBody {BODY} at (8,8) size 784x103
+ RenderTable {TABLE} at (0,0) size 784x103 [border: (2px outset #808080)]
+ RenderTableSection {TBODY} at (2,2) size 0x99
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,21) size 38x56 [bgcolor=#AAAAAA] [border: (1px inset #808080)] [r=0 c=0 rs=3 cs=1]
+ RenderText {TEXT} at (1,1) size 36x54
+ text run at (1,1) width 26: "Left"
+ text run at (1,19) width 13: "(3"
+ text run at (1,37) width 36: "rows)"
+ RenderTableCell {TD} at (38,23) size 303x20 [bgcolor=#000000] [border: (1px inset #808080)] [r=0 c=1 rs=2 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (341,0) size 98x20 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=10]
+ RenderText {TEXT} at (1,1) size 96x18
+ text run at (1,1) width 96: "Middle (1 row)"
+ RenderTableCell {TD} at (439,23) size 303x20 [bgcolor=#000000] [border: (1px inset #808080)] [r=0 c=12 rs=2 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (742,21) size 38x56 [bgcolor=#AAAAAA] [border: (1px inset #808080)] [r=0 c=13 rs=3 cs=1]
+ RenderText {TEXT} at (2,1) size 36x54
+ text run at (2,1) width 35: "Right"
+ text run at (24,19) width 13: "(3"
+ text run at (1,37) width 36: "rows)"
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (341,35) size 10x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (351,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=3 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (362,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=4 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (373,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=5 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (384,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=6 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (395,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=7 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (406,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=8 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (417,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=9 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableCell {TD} at (428,35) size 11x20 [bgcolor=#EEEEEE] [border: (1px inset #808080)] [r=1 c=10 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 4x18
+ text run at (1,1) width 4: " "
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (38,73) size 742x20 [bgcolor=#008000] [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=13]
+ RenderText {TEXT} at (469,1) size 272x18
+ text run at (469,1) width 272: "Bottom Row Overlaps with the Right Cell!"
diff --git a/LayoutTests/fast/table/rowspan-paint-order.html b/LayoutTests/fast/table/rowspan-paint-order.html
new file mode 100644
index 0000000..b023842
--- /dev/null
+++ b/LayoutTests/fast/table/rowspan-paint-order.html
@@ -0,0 +1,30 @@
+<html>
+<body>
+
+<table width="100%" height="100" border="2" cellspacing="0" cellpadding="0">
+
+<tr >
+<td bgcolor=#aaaaaa rowspan="3" >Left (3 rows)</td>
+<td rowspan="2" width="50%" bgcolor="#000000"> </td>
+<td colspan="10" align="center" nowrap valign="top" height="22" >Middle (1 row)</td>
+<td rowspan="2" width="50%" bgcolor="#000000"> </td>
+<td rowspan="3" bgcolor=#aaaaaa align="right" >Right (3 rows)
+</td>
+</tr>
+<!-- begin SF.net main navbar -->
+<tr> <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+ <td bgcolor="#eeeeee" align="left" valign="middle"> </td>
+
+</tr>
+<tr>
+<td colspan="13" bgcolor="green" align="right">Bottom Row Overlaps with the Right Cell!</td>
+</tr>
+</table>
+<!-- end SF.net header -->
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list