[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:39:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8d3f5c58408f0f19d7c1ab558332336a048d3e4f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 11 21:58:00 2004 +0000
Add new layout tests for float bug fixes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/block/float/030-expected.txt b/LayoutTests/fast/block/float/030-expected.txt
new file mode 100644
index 0000000..26c1538
--- /dev/null
+++ b/LayoutTests/fast/block/float/030-expected.txt
@@ -0,0 +1,19 @@
+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 784x576
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {TEXT} at (0,0) size 750x18
+ text run at (0,0) width 137: "You should see a 500"
+ text run at (137,0) width 326: "x300 rectangle with orange, yellow and olive rects. "
+ text run at (463,0) width 287: "No red should be visible or the test has failed."
+ RenderBlock (floating) {DIV} at (0,34) size 500x300 [bgcolor=#FF0000]
+ RenderBlock (floating) {DIV} at (0,0) size 250x300 [bgcolor=#FFA500]
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock (floating) {DIV} at (250,0) size 250x300
+ RenderBlock (floating) {DIV} at (0,0) size 250x40 [bgcolor=#FFFF00]
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock (floating) {DIV} at (0,40) size 250x260 [bgcolor=#808000]
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/block/float/030.html b/LayoutTests/fast/block/float/030.html
new file mode 100644
index 0000000..d32a949
--- /dev/null
+++ b/LayoutTests/fast/block/float/030.html
@@ -0,0 +1,56 @@
+<html><head>
+
+
+<style>
+
+#maincontent {
+ width:500px;
+ float:left;
+ background-color:red;
+}
+
+.leftchunk {
+ float:left;
+ background-color:orange;
+ width:250px;
+ height:300px;
+}
+
+
+.rightchunk {
+ float:left;
+ background-color: red;
+}
+
+#child1 {
+ width:250px;
+ float:left;
+ height:40px;
+ background-color: yellow;
+}
+
+#child2 {
+ float:left;
+ clear:left;
+ width:250px;
+ height:260px;
+ background-color: olive;
+}
+
+</style>
+
+</head>
+
+<p>You should see a 500x300 rectangle with orange, yellow and olive rects. No red should be visible or the test has failed.
+</p>
+
+<div id="maincontent">
+
+<div class="leftchunk"></div>
+
+<div class="rightchunk">
+<div id="child1"></div>
+<div id="child2"></div>
+</div>
+
+
diff --git a/LayoutTests/fast/block/float/031-expected.txt b/LayoutTests/fast/block/float/031-expected.txt
new file mode 100644
index 0000000..f289343
--- /dev/null
+++ b/LayoutTests/fast/block/float/031-expected.txt
@@ -0,0 +1,55 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x300
+ RenderBlock {HTML} at (0,0) size 800x300
+ RenderBody {BODY} at (8,8) size 784x284
+ RenderBlock {P} at (0,0) size 784x50
+ RenderText {TEXT} at (16,16) size 348x18
+ text run at (16,16) width 348: "\"ONE\" and \"TWO\" below should be on the same line."
+ RenderBlock (floating) {UL} at (0,50) size 186x22 [border: (2px solid #0000FF)]
+ RenderBlock (floating) {LI} at (2,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 34x18
+ text run at (0,0) width 34: "ONE"
+ RenderBlock (floating) {LI} at (93,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 37x18
+ text run at (0,0) width 37: "TWO"
+ RenderBlock {DIV} at (2,2) size 182x0
+ RenderBlock {P} at (0,72) size 784x50
+ RenderText {TEXT} at (16,16) size 352x18
+ text run at (16,16) width 352: "\"ONE\" and \"TWO\" below should be on different lines."
+ RenderBlock (floating) {UL} at (0,122) size 95x40 [border: (2px solid #0000FF)]
+ RenderBlock (floating) {LI} at (2,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 34x18
+ text run at (0,0) width 34: "ONE"
+ RenderBlock (floating) {LI} at (2,20) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 37x18
+ text run at (0,0) width 37: "TWO"
+ RenderBlock {DIV} at (2,2) size 91x0
+ RenderBlock {P} at (0,162) size 784x50
+ RenderText {TEXT} at (16,16) size 348x18
+ text run at (16,16) width 348: "\"ONE\" and \"TWO\" below should be on the same line."
+ RenderBlock (floating) {UL} at (0,212) size 186x22 [border: (2px solid #0000FF)]
+ RenderBlock (floating) {LI} at (2,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 34x18
+ text run at (0,0) width 34: "ONE"
+ RenderBlock (floating) {LI} at (93,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 37x18
+ text run at (0,0) width 37: "TWO"
+ RenderBlock {P} at (0,234) size 784x50
+ RenderText {TEXT} at (16,16) size 352x18
+ text run at (16,16) width 352: "\"ONE\" and \"TWO\" below should be on different lines."
+ RenderBlock (floating) {UL} at (0,284) size 95x40 [border: (2px solid #0000FF)]
+ RenderBlock (floating) {LI} at (2,2) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 34x18
+ text run at (0,0) width 34: "ONE"
+ RenderBlock (floating) {LI} at (2,20) size 91x18
+ RenderBlock {SPAN} at (0,0) size 91x18 [bgcolor=#EEEEEE]
+ RenderText {TEXT} at (0,0) size 37x18
+ text run at (0,0) width 37: "TWO"
diff --git a/LayoutTests/fast/block/float/031.html b/LayoutTests/fast/block/float/031.html
new file mode 100644
index 0000000..0d31050
--- /dev/null
+++ b/LayoutTests/fast/block/float/031.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <link rel="stylesheet" type="text/css" href="style.css" />
+ <title>Killer</title>
+
+ <style>
+
+p { clear: left; margin: 0; padding: 1em; }
+
+ul { margin: 0;
+ padding: 0;
+ border: 2px solid blue;
+ clear:left;
+ float:left;
+}
+
+li {
+ display: block;
+ float: left;
+ padding: 0px;
+ margin: 0px;
+}
+
+span {
+ width: 91px;
+ display: block;
+ background-color:#eeeeee;
+}
+
+</style>
+
+ </head>
+
+ <body>
+ <p> "ONE" and "TWO" below should be on the same line.</p>
+
+ <ul><li><span>ONE</a></li><li><span class="last">TWO</a></li><div></div></ul>
+
+ <p> "ONE" and "TWO" below should be on different lines.</p>
+
+ <ul><li><span>ONE</a></li><li style="clear:left"><span class="last">TWO</a></li><div></div></ul>
+
+ <p> "ONE" and "TWO" below should be on the same line.</p>
+
+ <ul><li><span>ONE</a></li><li><span class="last">TWO</a></li></ul>
+
+ <p> "ONE" and "TWO" below should be on different lines.</p>
+
+ <ul><li><span>ONE</a></li><li style="clear:left"><span class="last">TWO</a></li></ul>
+
+
+
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list