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

Sat Sep 26 07:54:14 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 0294cbb427617ed65255e176cf05ea8b14f8bbb8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 27 01:23:04 2003 +0000

    Add a test for floats/clearing/margin-collapsing under the new system
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/block/float/024-expected.txt b/LayoutTests/fast/block/float/024-expected.txt
new file mode 100644
index 0000000..dc162e5
--- /dev/null
+++ b/LayoutTests/fast/block/float/024-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x333
+  RenderBlock {HTML} at (0,0) size 800x333
+    RenderBody {BODY} at (0,0) size 800x333
+      RenderBlock {DIV} at (0,0) size 800x121 [bgcolor=#008000]
+        RenderBlock {H1} at (0,51) size 800x70 [color=#FFFFFF] [bgcolor=#000000]
+        RenderBlock {DIV} at (0,171) size 800x0 [bgcolor=#000000]
+          RenderBlock {UL} at (0,0) size 800x0
+            RenderBlock (floating) {LI} at (0,0) size 498x21
+              RenderText {TEXT} at (2,2) size 494x17
+                text run at (2,2) width 494: "There should be a gap between this float and the green rectangle above."
+      RenderBlock {DIV} at (0,221) size 800x49 [bgcolor=#DDDDDD]
+        RenderBlock (floating) {DIV} at (2,2) size 28x28 [bgcolor=#FFFFFF]
+        RenderBlock (anonymous) at (2,2) size 796x0 [bgcolor=#000000]
+          RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#DDDDDD]
+        RenderBlock {DIV} at (2,30) size 796x0 [bgcolor=#000000]
+        RenderBlock (anonymous) at (2,30) size 796x17 [bgcolor=#000000]
+          RenderText {TEXT} at (0,0) size 526x17 [bgcolor=#DDDDDD]
+            text run at (0,0) width 409: "This text should be inside a black rectangle and below the 2"
+            text run at (409,0) width 117: "em white square."
+      RenderBlock {DIV} at (0,284) size 800x49 [bgcolor=#DDDDDD]
+        RenderBlock (floating) {DIV} at (2,2) size 28x28 [bgcolor=#FFFFFF]
+        RenderBlock (anonymous) at (2,2) size 796x0 [bgcolor=#000000]
+          RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#DDDDDD]
+        RenderBlock {DIV} at (2,30) size 796x0 [bgcolor=#000000]
+        RenderBlock (anonymous) at (2,30) size 796x17 [bgcolor=#000000]
+          RenderText {TEXT} at (0,0) size 558x17 [bgcolor=#DDDDDD]
+            text run at (0,0) width 441: "This text should also be inside a black rectangle and below the 2"
+            text run at (441,0) width 117: "em white square."
diff --git a/LayoutTests/fast/block/float/024.html b/LayoutTests/fast/block/float/024.html
new file mode 100644
index 0000000..6647a2b
--- /dev/null
+++ b/LayoutTests/fast/block/float/024.html
@@ -0,0 +1,56 @@
+<html>
+<head>
+<style>
+body {
+  margin: 0px;
+  padding: 0px;
+}
+
+#logo {
+  background-color: green;
+  border-top: 1px solid white;
+}
+
+h1 {
+  margin-top: 50px;
+  margin-bottom: 50px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  font-size: 220%;
+  color: white;
+}
+
+ul {
+  margin: 0;
+  padding: 0;
+}
+
+li {
+  float:left;
+  border: 2px solid blue;
+  display: block;
+  margin: 0px;
+}
+</style>
+</head>
+<body>
+<div id="logo">
+<h1 style="height:30px"></h1>
+<div>
+<ul>
+<li>There should be a gap between this float and the green rectangle above.
+</ul>
+</div>
+</div>
+
+<div style="margin-top:100px;background-color:#dddddd; border:2px solid black">
+<div style="float:left;width:2em;height:2em;background-color:white"></div>
+<div style="clear:both;margin-top:1em;margin-bottom:1em"></div>
+This text should be inside a black rectangle and below the 2em white square.
+</div>
+<div style="margin-top:1em;background-color:#dddddd; border:2px solid black">
+<div style="float:left;width:2em;height:2em;background-color:white"></div>
+<div style="clear:both;margin-top:-1em;margin-bottom:1em"></div>
+This text should also be inside a black rectangle and below the 2em white square.
+</div>
+

-- 
WebKit Debian packaging

