[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 08:26:24 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit e511fd397ca706e1ce9f2ab7232e37e34af2cd31
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 12 00:49:20 2004 +0000

    Adding test of zeldman margin collapse bug.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6077 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/block/margin-collapse/100-expected.txt b/LayoutTests/fast/block/margin-collapse/100-expected.txt
new file mode 100644
index 0000000..581c462
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/100-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x519
+  RenderBlock {HTML} at (0,0) size 800x519
+    RenderBody {BODY} at (8,8) size 784x503
+      RenderBlock {DIV} at (0,0) size 385x503
+        RenderImage {IMG} at (0,0) size 395x275
+        RenderBlock {H2} at (0,315) size 385x28
+          RenderText {TEXT} at (0,0) size 316x28
+            text run at (0,0) width 316: "This text should be on line one."
+        RenderBlock (anonymous) at (0,362) size 385x36
+          RenderText {TEXT} at (0,0) size 340x36
+            text run at (0,0) width 269: "This text should be on the following lines. "
+            text run at (269,0) width 71: "These lines"
+            text run at (0,18) width 121: "should not overlap."
+        RenderBlock {H2} at (0,438) size 385x28
+          RenderText {TEXT} at (0,0) size 211x28
+            text run at (0,0) width 211: "Here's what's weird."
+        RenderBlock (anonymous) at (0,485) size 385x18
+          RenderText {TEXT} at (0,0) size 136x18
+            text run at (0,0) width 136: "The problem persists!"
diff --git a/LayoutTests/fast/block/margin-collapse/100.html b/LayoutTests/fast/block/margin-collapse/100.html
new file mode 100644
index 0000000..b519595
--- /dev/null
+++ b/LayoutTests/fast/block/margin-collapse/100.html
@@ -0,0 +1,36 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+
+    <title>Jeffrey Zeldman Presents: The Daily Report</title>
+
+<style>
+        
+#bravefourhundred {
+	width: 385px;
+}
+
+h2 { margin-top: 40px; }
+
+img {
+    display: block;
+}
+</style>
+
+
+
+  </head>
+
+<body>
+<div id="bravefourhundred">
+<img width="395" height="275" border="0">
+
+<h2>This text should be on line one.</h2>
+
+This text should be on the following lines.  These lines should not overlap.
+
+<h2>Here's what's weird.</h2>
+
+The problem persists!
+</div>
+</body>
+</html>

-- 
WebKit Debian packaging

