[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:22:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f7ce8a61be49b7f86615f419895ceb8111b2f152
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 22 02:52:51 2004 +0000
Add margin collapsing tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5956 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/block/margin-collapse/055-expected.txt b/LayoutTests/fast/block/margin-collapse/055-expected.txt
new file mode 100644
index 0000000..0dbe2aa
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/055-expected.txt
@@ -0,0 +1,83 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x212
+ RenderBlock {HTML} at (0,0) size 800x212
+ RenderBody {BODY} at (8,16) size 784x188
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 461x18
+ text run at (0,0) width 405: "All the following should look the same (and all should look like "
+ text run at (405,0) width 56: "the first)."
+ RenderTable {TABLE} at (0,34) size 450x154
+ RenderTableSection {TBODY} at (0,0) size 0x154
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (58,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (114,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (170,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=3 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (226,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=4 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (282,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=5 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (338,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=6 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
+ RenderTableCell {TD} at (394,2) size 54x150 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=7 rs=1 cs=1]
+ RenderBlock {DIV} at (3,3) size 48x144 [color=#FFFF00] [bgcolor=#FFA500]
+ RenderBlock {DIV} at (0,0) size 48x48 [bgcolor=#00FF00]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "A"
+ RenderBlock {DIV} at (0,96) size 48x0
+ RenderBlock {DIV} at (0,96) size 48x48 [bgcolor=#00FFFF]
+ RenderText {TEXT} at (0,0) size 48x48
+ text run at (0,0) width 48: "C"
diff --git a/LayoutTests/fast/block/margin-collapse/055.html b/LayoutTests/fast/block/margin-collapse/055.html
new file mode 100644
index 0000000..5e3ea91
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/055.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+ <head>
+ <title>Margin Collapsing: effect of margins on collapsing-through</title>
+ <style type="text/css">
+ td { border: solid; background: red; padding: 0; font: 3em/1 Ahem; }
+ .bg { background: orange; color: yellow; }
+ .a { margin: 0 0 1em 0; background: lime; }
+ .c { margin: 1em 0 0 0; background: aqua; }
+ .b1 { margin: 1em 0 1em 0; }
+ .b2 { margin: 0em 0 1em 0; }
+ .b3 { margin: 1em 0 0em 0; }
+ .b4 { margin: 0em 0 0em 0; }
+ .b5 { margin: 0.5em 0 0.5em 0; }
+ .b6 { margin: 0em 0 0.5em 0; }
+ .b7 { margin: 0.5em 0 0em 0; }
+ .control .a { margin: 0 0 1em 0; }
+ .control .c { margin: 0; }
+ </style>
+ </head>
+ <body>
+ <p>All the following should look the same (and all should look like
+ the first).</p>
+ <table>
+ <tr>
+ <td class="control">
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b1"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b2"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b3"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b4"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b5"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b6"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ <td>
+ <div class="bg">
+ <div class="a">A</div>
+ <div class="b7"></div>
+ <div class="c">C</div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/LayoutTests/fast/block/margin-collapse/057-expected.txt b/LayoutTests/fast/block/margin-collapse/057-expected.txt
new file mode 100644
index 0000000..e47331c
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/057-expected.txt
@@ -0,0 +1,57 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x336
+ RenderBlock {HTML} at (0,0) size 800x336
+ RenderBody {BODY} at (8,16) size 784x312
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 409x18
+ text run at (0,0) width 409: "There six boxes below should look the same with no red present."
+ RenderTable {TABLE} at (0,34) size 416x278
+ RenderTableSection {TBODY} at (0,0) size 0x278
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 136x136 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderTableCell {TD} at (140,2) size 136x136 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderTableCell {TD} at (278,2) size 136x136 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,140) size 136x136 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderBlock {DIV} at (16,0) size 96x0
+ RenderTableCell {TD} at (140,140) size 136x136 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderBlock {DIV} at (16,0) size 96x0
+ RenderTableCell {TD} at (278,140) size 136x136 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
+ RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
+ RenderBlock (anonymous) at (0,0) size 128x0
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,64) size 128x64 [bgcolor=#FF0000] [border: (64px solid #FFFF00) none]
+ RenderBlock {DIV} at (16,0) size 96x0
diff --git a/LayoutTests/fast/block/margin-collapse/057.html b/LayoutTests/fast/block/margin-collapse/057.html
new file mode 100644
index 0000000..74335e0
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/057.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en"> <!-- This is similar to tests 022 and 023 -->
+ <head>
+ <title>Margin Collapsing: clear (varying margins)</title>
+ <style type="text/css">
+ .test { border: solid; background: red; width: 8em; }
+ .container { background: lime; }
+ .float { float: left; height: 4em; width: 4em; background: aqua; }
+ .empty { margin: 1em; background: red; }
+ .clear { clear: left; border-bottom: 4em solid yellow; background: red; }
+ .a .clear { margin-top: 0em; }
+ .b .clear { margin-top: 1em; }
+ .c .clear { margin-top: 2em; }
+ </style>
+ </head>
+ <body>
+ <p>There six boxes below should look the same with no red present.</p>
+ <table>
+ <tr>
+ <td>
+ <div class="test a">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="test b">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="test c">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="test a">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> <div class="empty"> </div> </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="test b">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> <div class="empty"> </div> </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="test c">
+ <div class="container">
+ <div class="float"> </div>
+ <div class="clear"> <div class="empty"> </div> </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/LayoutTests/fast/block/margin-collapse/058-expected.txt b/LayoutTests/fast/block/margin-collapse/058-expected.txt
new file mode 100644
index 0000000..39d4b0b
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/058-expected.txt
@@ -0,0 +1,27 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x192
+ RenderBlock {HTML} at (0,0) size 800x192
+ RenderBody {BODY} at (8,16) size 784x168
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 295x18
+ text run at (0,0) width 295: "The following two squares should be identical."
+ RenderTable {TABLE} at (0,34) size 252x134
+ RenderTableSection {TBODY} at (0,0) size 0x134
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (16,16) size 102x102 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 102x102 [bgcolor=#FFFF00] [border: (3px solid #000000)]
+ RenderBlock {DIV} at (3,35) size 96x0 [bgcolor=#FF0000]
+ RenderBlock (floating) {DIV} at (3,35) size 48x32 [bgcolor=#FFA500]
+ RenderBlock {DIV} at (3,35) size 96x0 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (3,67) size 96x32 [border: (32px solid #FFA500) none]
+ RenderTableCell {TD} at (134,16) size 102x102 [bgcolor=#FF0000] [r=0 c=1 rs=1 cs=1]
+ RenderTable {TABLE} at (0,0) size 102x102 [border: (3px solid #000000)]
+ RenderTableSection {TBODY} at (3,3) size 0x96
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,16) size 96x0 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=2]
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,48) size 48x0 [bgcolor=#FFA500] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (48,48) size 48x0 [bgcolor=#FFFF00] [r=1 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,80) size 96x0 [bgcolor=#FFA500] [r=2 c=0 rs=1 cs=2]
diff --git a/LayoutTests/fast/block/margin-collapse/058.html b/LayoutTests/fast/block/margin-collapse/058.html
new file mode 100644
index 0000000..2008668
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/058.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en"> <!-- variant of 023 -->
+ <head>
+ <title>Margin Collapsing: clear (with nearby collapse-through block)</title>
+ <style type="text/css">
+ table, td { padding: 0; border-spacing: 0; }
+ .comparator { border-spacing: 1em; }
+ .test, .control { background: red; }
+ .test .container { display: block; margin: 0; width: 6em; background: yellow; border: solid; }
+ .test .float { float: left; margin: 0; height: 2em; width: 3em; background: orange; }
+ .test .empty { display: block; background: red; margin: 2em 0; }
+ .test .clear { clear: left; display: block; border-top: 2em solid orange; margin-top: 1em; }
+ .control table { border: solid; }
+ .control .square { height: 2em; width: 3em; }
+ .control .thin { height: 2em; width: 6em; }
+ .control .thick { height: 2em; width: 6em; }
+ .control .yellow { background: yellow; }
+ .control .orange { background: orange; }
+ </style>
+ </head>
+ <body>
+ <p>The following two squares should be identical.</p>
+ <table class="comparator">
+ <tr>
+ <td class="test">
+ <div class="container">
+ <div class="empty"> </div>
+ <div class="float"> </div>
+ <div class="empty"> </div>
+ <div class="clear"> </div>
+ </div>
+ </td>
+ <td class="control">
+ <table>
+ <tr>
+ <td colspan="2" class="thick yellow"></td>
+ </tr>
+ <tr>
+ <td class="square orange"></td>
+ <td class="square yellow"></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="thin orange"></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list