[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 07:54:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fe33942fcde6f930b1b7281714e48044160332ab
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 27 01:15:38 2003 +0000
Remove margin collapsing tests that are now buggy/invalid
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4897 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/block/margin-collapse/013-expected.txt b/LayoutTests/fast/block/margin-collapse/013-expected.txt
deleted file mode 100644
index 12a2b9c..0000000
--- a/LayoutTests/fast/block/margin-collapse/013-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 800x600
- RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x346
- RenderBlock {HTML} at (0,0) size 800x346
- RenderBody {BODY} at (8,14) size 784x318
- RenderBlock {P} at (0,0) size 784x17
- RenderText {TEXT} at (0,0) size 542x17
- text run at (0,0) width 542: "The following two columns should be pixel perfect identical with no red visible."
- RenderTable {TABLE} at (0,31) size 106x256 [bgcolor=#FF0000]
- RenderTableSection {TBODY} at (3,3) size 0x250 [bgcolor=#000000]
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 50x250 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FFFF00]
- RenderBlock {DIV} at (0,150) size 50x0 [bgcolor=#FF0000]
- RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#00FF00]
- RenderBlock {DIV} at (0,200) size 50x50 [bgcolor=#00FFFF]
- RenderTableCell {TD} at (50,0) size 50x250 [r=0 c=1 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 50x50
- RenderBlock {DIV} at (0,50) size 50x100
- RenderBlock {DIV} at (0,150) size 50x50
- RenderBlock {DIV} at (0,200) size 50x50
- RenderBlock {P} at (0,301) size 784x17
- RenderText {TEXT} at (0,0) size 285x17
- text run at (0,0) width 285: "This test is meaningless if you don't pass "
- RenderInline {A} at (0,0) size 57x17 [color=#0000EE]
- RenderText {TEXT} at (285,0) size 57x17
- text run at (285,0) width 57: "test 006"
- RenderText {TEXT} at (342,0) size 5x17
- text run at (342,0) width 5: "."
diff --git a/LayoutTests/fast/block/margin-collapse/013.html b/LayoutTests/fast/block/margin-collapse/013.html
deleted file mode 100644
index 2dc6a62..0000000
--- a/LayoutTests/fast/block/margin-collapse/013.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
- <head>
- <title>Margin Collapsing: in flow (position of collapsed-through element)</title>
- <style type="text/css">
- table { border-spacing: 0; font-size: 50px; border: solid; background: red; }
- td { padding: 0; }
- /* test */
- .test { background: orange; width: 1em; }
- .test .a { background: yellow; margin: 0 0 1em 0; height: 1em; }
- .test .b { background: red; margin: 2em 0 0 0; height: 0; }
- .test .c { background: aqua; margin: 3em 0 0 0; height: 1em; }
- .test .d { background: lime; margin: 0; height: 1em; }
- /* control */
- .control div { width: 1em; }
- .control .a { border-top: 1em yellow solid; }
- .control .b { border-top: 2em orange solid; }
- .control .c { border-top: 1em lime solid; }
- .control .d { border-top: 1em aqua solid; }
- </style>
- </head>
- <body>
- <p>The following two columns should be pixel perfect identical with no red visible.</p>
- <table>
- <tr>
- <td class="test">
- <div class="a"></div>
- <div class="b">
- <div class="d"></div>
- </div>
- <div class="c"></div>
- </td>
- <td class="control">
- <div class="a"></div>
- <div class="b"></div>
- <div class="c"></div>
- <div class="d"></div>
- </td>
- </tr>
- </table>
- <p>This test is meaningless if you don't pass <a href="006.html">test 006</a>.</p>
- </body>
-</html>
diff --git a/LayoutTests/fast/block/margin-collapse/014-expected.txt b/LayoutTests/fast/block/margin-collapse/014-expected.txt
deleted file mode 100644
index 12a2b9c..0000000
--- a/LayoutTests/fast/block/margin-collapse/014-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 800x600
- RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x346
- RenderBlock {HTML} at (0,0) size 800x346
- RenderBody {BODY} at (8,14) size 784x318
- RenderBlock {P} at (0,0) size 784x17
- RenderText {TEXT} at (0,0) size 542x17
- text run at (0,0) width 542: "The following two columns should be pixel perfect identical with no red visible."
- RenderTable {TABLE} at (0,31) size 106x256 [bgcolor=#FF0000]
- RenderTableSection {TBODY} at (3,3) size 0x250 [bgcolor=#000000]
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,0) size 50x250 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FFFF00]
- RenderBlock {DIV} at (0,150) size 50x0 [bgcolor=#FF0000]
- RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#00FF00]
- RenderBlock {DIV} at (0,200) size 50x50 [bgcolor=#00FFFF]
- RenderTableCell {TD} at (50,0) size 50x250 [r=0 c=1 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 50x50
- RenderBlock {DIV} at (0,50) size 50x100
- RenderBlock {DIV} at (0,150) size 50x50
- RenderBlock {DIV} at (0,200) size 50x50
- RenderBlock {P} at (0,301) size 784x17
- RenderText {TEXT} at (0,0) size 285x17
- text run at (0,0) width 285: "This test is meaningless if you don't pass "
- RenderInline {A} at (0,0) size 57x17 [color=#0000EE]
- RenderText {TEXT} at (285,0) size 57x17
- text run at (285,0) width 57: "test 006"
- RenderText {TEXT} at (342,0) size 5x17
- text run at (342,0) width 5: "."
diff --git a/LayoutTests/fast/block/margin-collapse/014.html b/LayoutTests/fast/block/margin-collapse/014.html
deleted file mode 100644
index 7f0881e..0000000
--- a/LayoutTests/fast/block/margin-collapse/014.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
- <head>
- <title>Margin Collapsing: in flow (position of collapsed-through element)</title>
- <style type="text/css">
- table { border-spacing: 0; font-size: 50px; border: solid; background: red; }
- td { padding: 0; }
- /* test */
- .test { background: orange; width: 1em; }
- .test .a { background: yellow; margin: 0 0 1em 0; height: 1em; }
- .test .b { background: red; margin: 2em 0 0 0; height: 0; }
- .test .c { background: aqua; margin: 3em 0 0 0; height: 1em; }
- .test .d { background: lime; margin: 2em 0 1em 0; height: 1em; }
- /* control */
- .control div { width: 1em; }
- .control .a { border-top: 1em yellow solid; }
- .control .b { border-top: 2em orange solid; }
- .control .c { border-top: 1em lime solid; }
- .control .d { border-top: 1em aqua solid; }
- </style>
- </head>
- <body>
- <p>The following two columns should be pixel perfect identical with no red visible.</p>
- <table>
- <tr>
- <td class="test">
- <div class="a"></div>
- <div class="b">
- <div class="d"></div>
- </div>
- <div class="c"></div>
- </td>
- <td class="control">
- <div class="a"></div>
- <div class="b"></div>
- <div class="c"></div>
- <div class="d"></div>
- </td>
- </tr>
- </table>
- <p>This test is meaningless if you don't pass <a href="006.html">test 006</a>.</p>
- </body>
-</html>
diff --git a/LayoutTests/fast/block/margin-collapse/023-expected.txt b/LayoutTests/fast/block/margin-collapse/023-expected.txt
deleted file mode 100644
index f2c8985..0000000
--- a/LayoutTests/fast/block/margin-collapse/023-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-layer at (0,0) size 800x600
- RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x193
- RenderBlock {HTML} at (0,0) size 800x193
- RenderBody {BODY} at (8,14) size 784x171
- RenderBlock {P} at (0,0) size 784x17
- RenderText {TEXT} at (0,0) size 318x17
- text run at (0,0) width 318: "The following two squares should be identical."
- RenderTable {TABLE} at (0,31) size 266x140
- RenderTableSection {TBODY} at (0,0) size 0x140
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (14,14) size 112x112 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (0,0) size 112x112 [bgcolor=#00FF00]
- RenderBlock (floating) {DIV} at (0,0) size 56x56 [bgcolor=#00FFFF]
- RenderBlock (anonymous) at (0,0) size 112x0 [bgcolor=#000000]
- RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#00FF00]
- RenderBlock {DIV} at (0,0) size 112x0 [bgcolor=#FF0000]
- RenderBlock {DIV} at (0,56) size 112x56 [bgcolor=#000000]
- RenderTableCell {TD} at (140,14) size 112x112 [bgcolor=#FF0000] [r=0 c=1 rs=1 cs=1]
- RenderTable {TABLE} at (0,0) size 112x112 [bgcolor=#000000]
- RenderTableSection {TBODY} at (0,0) size 0x112
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,28) size 56x0 [bgcolor=#00FFFF] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (56,28) size 56x0 [bgcolor=#00FF00] [r=0 c=1 rs=1 cs=1]
- RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (0,84) size 112x0 [bgcolor=#FFFF00] [r=1 c=0 rs=1 cs=2]
diff --git a/LayoutTests/fast/block/margin-collapse/023.html b/LayoutTests/fast/block/margin-collapse/023.html
deleted file mode 100644
index 950d10a..0000000
--- a/LayoutTests/fast/block/margin-collapse/023.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
- <head>
- <title>Margin Collapsing: clear (simple)</title>
- <style type="text/css">
- table, td { padding: 0; border-spacing: 0; }
- .comparator { border-spacing: 1em; }
- .test, .control { border: solid; background: red; }
- .test .container { display: block; margin: 0; width: 8em; background: lime; }
- .test .float { float: left; margin: 0; height: 4em; width: 4em; background: aqua; }
- .test .empty { display: block; background: red; margin: 1em 0; }
- .test .clear { clear: left; display: block; border: 2em solid yellow; margin-top: 1em; }
- .control .square { height: 4em; width: 4em; }
- .control .rectangle { height: 4em; width: 8em; }
- .control .lime { background: lime; }
- .control .aqua { background: aqua; }
- .control .yellow { background: yellow; }
- </style>
- </head>
- <body>
- <p>The following two squares should be identical.</p>
- <table class="comparator">
- <tr>
- <td class="test">
- <div class="container">
- <div class="float"> </div>
- <div class="empty"> </div>
- <div class="clear"> </div>
- </div>
- </td>
- <td class="control">
- <table>
- <tr>
- <td class="square aqua"></td>
- <td class="square lime"></td>
- </tr>
- <tr>
- <td colspan="2" class="rectangle yellow"></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </body>
-</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list