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

Sat Sep 26 08:09:59 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 64c8d13d4fd03a51a8c754ebff925dc8c197dd7a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 7 07:41:52 2003 +0000

    Adding inline-block growth/collapsing layout tests.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/inline-block/004-expected.txt b/LayoutTests/fast/inline-block/004-expected.txt
new file mode 100644
index 0000000..545a05a
--- /dev/null
+++ b/LayoutTests/fast/inline-block/004-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x156
+  RenderBlock {HTML} at (0,0) size 800x156
+    RenderBody {BODY} at (8,8) size 784x132
+      RenderBlock {P} at (0,0) size 784x132
+        RenderBlock {SPAN} at (0,0) size 132x132 [bgcolor=#008000]
+          RenderBlock {SPAN} at (16,16) size 100x100 [bgcolor=#FFFF00]
diff --git a/LayoutTests/fast/inline-block/004.html b/LayoutTests/fast/inline-block/004.html
new file mode 100644
index 0000000..d178e06
--- /dev/null
+++ b/LayoutTests/fast/inline-block/004.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<style>
+.inlineblock {
+  display: inline-block;
+  background-color: green;
+}
+
+.child {
+  display: block;
+  margin: 1em;
+  background-color:yellow;
+  width:100px;
+  height:100px;
+}
+</style>
+</head>
+<body>
+<p><span class="inlineblock"><span class="child"></span></span></p>
diff --git a/LayoutTests/fast/inline-block/005-expected.txt b/LayoutTests/fast/inline-block/005-expected.txt
new file mode 100644
index 0000000..fbb61ea
--- /dev/null
+++ b/LayoutTests/fast/inline-block/005-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x156
+  RenderBlock {HTML} at (0,0) size 800x156
+    RenderBody {BODY} at (8,8) size 784x132
+      RenderBlock {P} at (0,0) size 784x132
+        RenderBlock {SPAN} at (0,0) size 132x132 [bgcolor=#008000]
+          RenderBlock (floating) {SPAN} at (16,16) size 100x100 [bgcolor=#FFFF00]
diff --git a/LayoutTests/fast/inline-block/005.html b/LayoutTests/fast/inline-block/005.html
new file mode 100644
index 0000000..11355e2
--- /dev/null
+++ b/LayoutTests/fast/inline-block/005.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<style>
+.inlineblock {
+  display: inline-block;
+  background-color: green;
+}
+
+.child {
+  float:left;
+  display: block;
+  margin: 1em;
+  background-color:yellow;
+  width:100px;
+  height:100px;
+}
+</style>
+</head>
+<body>
+<p><span class="inlineblock"><span class="child"></span></span></p>

-- 
WebKit Debian packaging

