Reviewed by Hyatt.

        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7440
        Floats not positioned correctly

        * fast/block/float/multiple-float-positioning-expected.checksum: Added.
        * fast/block/float/multiple-float-positioning-expected.png: Added.
        * fast/block/float/multiple-float-positioning-expected.txt: Added.
        * fast/block/float/multiple-float-positioning.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5094ebae4f42ace98812b2000f06d5ff0f8bcd53..a04f2db641596adba8afaccc78fd2e55236ad08f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-24  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Hyatt.
+
+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7440
+        Floats not positioned correctly
+
+        * fast/block/float/multiple-float-positioning-expected.checksum: Added.
+        * fast/block/float/multiple-float-positioning-expected.png: Added.
+        * fast/block/float/multiple-float-positioning-expected.txt: Added.
+        * fast/block/float/multiple-float-positioning.html: Added.
+
 2006-02-24  Graham Dennis  <Graham.Dennis@gmail.com>
 
         Reviewed by justin

diff --git a/LayoutTests/fast/block/float/multiple-float-positioning-expected.checksum b/LayoutTests/fast/block/float/multiple-float-positioning-expected.checksum
new file mode 100644 (file)
index 0000000..cc41490
--- /dev/null
+++ b/LayoutTests/fast/block/float/multiple-float-positioning-expected.checksum
@@ -0,0 +1 @@
+e51c551874bca640aa4b5a2217d1c183
\ No newline at end of file

diff --git a/LayoutTests/fast/block/float/multiple-float-positioning-expected.png b/LayoutTests/fast/block/float/multiple-float-positioning-expected.png
new file mode 100644 (file)
index 0000000..33ce1f1
Binary files /dev/null and b/LayoutTests/fast/block/float/multiple-float-positioning-expected.png differ

diff --git a/LayoutTests/fast/block/float/multiple-float-positioning-expected.txt b/LayoutTests/fast/block/float/multiple-float-positioning-expected.txt
new file mode 100644 (file)
index 0000000..a04d22a
--- /dev/null
+++ b/LayoutTests/fast/block/float/multiple-float-positioning-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 146x132 [border: (3px solid #008000)]
+        RenderText {TEXT} at (3,3) size 137x126
+          text run at (3,3) width 137: "Test float positioning."
+          text run at (3,21) width 132: "There should be four"
+          text run at (3,39) width 93: "red boxes with"
+          text run at (3,57) width 102: "numbers 1,2,3,4"
+          text run at (3,75) width 125: "below this text. The"
+          text run at (3,93) width 107: "boxes should not"
+          text run at (3,111) width 104: "overlap this text."
+        RenderBlock (floating) {DIV} at (3,129) size 76x24 [border: (3px solid #FF0000)]
+          RenderText {TEXT} at (3,3) size 8x18
+            text run at (3,3) width 8: "1"
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderBlock (floating) {DIV} at (3,153) size 76x24 [border: (3px solid #FF0000)]
+          RenderText {TEXT} at (3,3) size 8x18
+            text run at (3,3) width 8: "2"
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderBlock (floating) {DIV} at (3,177) size 76x24 [border: (3px solid #FF0000)]
+          RenderText {TEXT} at (3,3) size 8x18
+            text run at (3,3) width 8: "3"
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderBlock (floating) {DIV} at (3,201) size 76x24 [border: (3px solid #FF0000)]
+          RenderText {TEXT} at (3,3) size 8x18
+            text run at (3,3) width 8: "4"
+        RenderText {TEXT} at (0,0) size 0x0

diff --git a/LayoutTests/fast/block/float/multiple-float-positioning.html b/LayoutTests/fast/block/float/multiple-float-positioning.html
new file mode 100644 (file)
index 0000000..6cadae8
--- /dev/null
+++ b/LayoutTests/fast/block/float/multiple-float-positioning.html
@@ -0,0 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
+<head>
+<style>
+div { border: 3px solid red }
+div.etusivuText { width: 140px;   border: 3px solid green }
+div div { float: left; width: 70px;  }
+</style>
+
+</head>
+<body>
+<div class="etusivuText">Test float positioning. There should be four red boxes with numbers 1,2,3,4 below this text. The boxes should not overlap this text.
+<div>1</div>
+<div>2</div>
+<div>3</div>
+<div>4</div>
+</div>