[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:23:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 17d7ec7dbf85d9982c895a892c4faad53fe8bddd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 22 09:18:36 2004 +0000
Adding even more margin collapsing tests... courtesy of Hixie.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5959 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/block/margin-collapse/056-expected.txt b/LayoutTests/fast/block/margin-collapse/056-expected.txt
new file mode 100644
index 0000000..f132f01
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/056-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x256
+ RenderBlock {HTML} at (0,0) size 800x256
+ RenderBody {BODY} at (8,16) size 784x224
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 230x18
+ text run at (0,0) width 230: "There should be no red on this page."
+ RenderTable {TABLE} at (0,34) size 106x156 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderTableSection {TBODY} at (3,3) size 0x150
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 50x150 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 50x50
+ RenderBlock {DIV} at (0,0) size 50x150 [bgcolor=#00FFFF]
+ RenderBlock {DIV} at (0,50) size 50x50 [bgcolor=#FFFF00]
+ RenderTableCell {TD} at (50,0) size 50x150 [bgcolor=#FF0000] [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 50x50 [border: (50px solid #00FFFF) none]
+ RenderBlock {DIV} at (0,50) size 50x50 [border: (50px solid #FFFF00) none]
+ RenderBlock {DIV} at (0,100) size 50x50 [border: (50px solid #00FFFF) none]
+ RenderBlock {P} at (0,206) size 784x18
+ RenderText {TEXT} at (0,0) size 56x18
+ text run at (0,0) width 56: "See also "
+ RenderInline {A} at (0,0) size 49x18 [color=#0000EE]
+ RenderText {TEXT} at (56,0) size 49x18
+ text run at (56,0) width 49: "test 019"
+ RenderText {TEXT} at (105,0) size 8x18
+ text run at (105,0) width 8: ", "
+ RenderInline {A} at (0,0) size 49x18 [color=#0000EE]
+ RenderText {TEXT} at (113,0) size 49x18
+ text run at (113,0) width 49: "test 020"
+ RenderText {TEXT} at (162,0) size 4x18
+ text run at (162,0) width 4: "."
diff --git a/LayoutTests/fast/block/margin-collapse/056.html b/LayoutTests/fast/block/margin-collapse/056.html
new file mode 100644
index 0000000..26ad27e
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/056.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+ <head>
+ <title>Margin Collapsing: in flow (height, control) - not really margin collapsing</title>
+ <style type="text/css">
+ table { border-spacing: 0; font-size: 50px; border: solid; background: red; }
+ td { padding: 0; width: 1em; background: red; }
+
+ .a .container { height: 1em; background: red; }
+ .a .sized { height: 3em; margin: 0; background: aqua; }
+ .a .after { height: 1em; margin: 0 0 1em 0; background: yellow; }
+
+ .b .a { border-top: solid aqua 1em; }
+ .b .b { border-top: solid yellow 1em; }
+ .b .c { border-top: solid aqua 1em; }
+
+ </style>
+ </head>
+ <body>
+ <p>There should be no red on this page.</p>
+ <table>
+ <tr>
+ <td class="a">
+ <div class="container">
+ <div class="sized"></div>
+ </div>
+ <div class="after"></div>
+ </td>
+ <td class="b">
+ <div class="a"></div>
+ <div class="b"></div>
+ <div class="c"></div>
+ </td>
+ </tr>
+ </table>
+ <p>See also <a href="019.html">test 019</a>, <a href="020.html">test 020</a>.</p>
+ </body>
+</html>
diff --git a/LayoutTests/fast/block/margin-collapse/059-expected.txt b/LayoutTests/fast/block/margin-collapse/059-expected.txt
new file mode 100644
index 0000000..84f1aab
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/059-expected.txt
@@ -0,0 +1,28 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x306
+ RenderBlock {HTML} at (0,0) size 800x306
+ RenderBody {BODY} at (8,16) size 784x274
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 230x18
+ text run at (0,0) width 230: "There should be no red on this page."
+ RenderTable {TABLE} at (0,34) size 106x206 [bgcolor=#FF0000] [border: (3px solid #000000)]
+ RenderTableSection {TBODY} at (3,3) size 0x200
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (0,0) size 50x200 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 50x150 [bgcolor=#00FFFF]
+ RenderBlock {DIV} at (0,50) size 50x50 [bgcolor=#FFFF00]
+ RenderTableCell {TD} at (50,0) size 50x200 [bgcolor=#FF0000] [r=0 c=1 rs=1 cs=1]
+ RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FFA500] [border: (50px solid #00FFFF) none]
+ RenderBlock {DIV} at (0,50) size 50x50 [border: (50px solid #FFFF00) none]
+ RenderBlock {DIV} at (0,100) size 50x50 [border: (50px solid #00FFFF) none]
+ RenderBlock {DIV} at (0,150) size 50x50 [border: (50px solid #FFA500) none]
+ RenderBlock {P} at (0,256) size 784x18
+ RenderText {TEXT} at (0,0) size 241x18
+ text run at (0,0) width 241: "This test is irrelevant if you don't pass "
+ RenderInline {A} at (0,0) size 49x18 [color=#0000EE]
+ RenderText {TEXT} at (241,0) size 49x18
+ text run at (241,0) width 49: "test 056"
+ RenderText {TEXT} at (290,0) size 4x18
+ text run at (290,0) width 4: "."
diff --git a/LayoutTests/fast/block/margin-collapse/059.html b/LayoutTests/fast/block/margin-collapse/059.html
new file mode 100644
index 0000000..418ef31
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/059.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+ <head>
+ <title>Margin Collapsing: in flow (height, simple) - not really margin collapsing</title>
+ <style type="text/css">
+ table { border-spacing: 0; font-size: 50px; border: solid; background: red; }
+ td { padding: 0; width: 1em; background: red; }
+
+ .a { background: orange; }
+ .a .container { height: 1em; background: red; }
+ .a .sized { height: 3em; margin: 0 0 1em 0; background: aqua; }
+ .a .after { height: 1em; margin: 0 0 1em 0; background: yellow; }
+
+ .b .a { border-top: solid aqua 1em; }
+ .b .b { border-top: solid yellow 1em; }
+ .b .c { border-top: solid aqua 1em; }
+ .b .d { border-top: solid orange 1em; }
+
+ </style>
+ </head>
+ <body>
+ <p>There should be no red on this page.</p>
+ <table>
+ <tr>
+ <td class="a">
+ <div class="container">
+ <div class="sized"></div>
+ </div>
+ <div class="after"></div>
+ </td>
+ <td class="b">
+ <div class="a"></div>
+ <div class="b"></div>
+ <div class="c"></div>
+ <div class="d"></div>
+ </td>
+ </tr>
+ </table>
+ <p>This test is irrelevant if you don't pass <a href="056.html">test 056</a>.</p>
+ </body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list