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

Sat Sep 26 08:07:03 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 3112fc9521c0349b8c8d8f9df2dce47efdc50019
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 29 09:02:43 2003 +0000

    Add inline block test inside a center tag.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/inline-block/003-expected.txt b/LayoutTests/fast/inline-block/003-expected.txt
new file mode 100644
index 0000000..0553174
--- /dev/null
+++ b/LayoutTests/fast/inline-block/003-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x118
+  RenderBlock {HTML} at (0,0) size 800x118
+    RenderBody {BODY} at (8,8) size 784x102
+      RenderBlock (anonymous) at (0,0) size 784x18
+        RenderText {TEXT} at (0,0) size 527x18
+          text run at (0,0) width 527: "The two divs below should be on the same line, since they are display: inline-block."
+      RenderBlock {CENTER} at (0,18) size 784x22
+        RenderBlock {DIV} at (88,0) size 304x22
+          RenderText {TEXT} at (103,2) size 97x18
+            text run at (103,2) width 97: "This is div one."
+        RenderBlock {DIV} at (392,0) size 304x22
+          RenderText {TEXT} at (103,2) size 98x18
+            text run at (103,2) width 98: "This is div two."
+        RenderText {TEXT} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,40) size 784x62
+        RenderText {TEXT} at (0,0) size 729x18
+          text run at (0,0) width 729: "The two marquees below should be on separate lines, since marquees fill the width of a containing block by default."
+        RenderInline {SPAN} at (0,0) size 784x36
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderText {TEXT} at (0,0) size 0x0
+layer at (8,66) size 784x22 clip at (10,68) size 780x18
+  RenderBlock {MARQUEE} at (0,18) size 784x22
+    RenderText {TEXT} at (2,2) size 97x18
+      text run at (2,2) width 97: "This is div one."
+layer at (8,88) size 784x22 clip at (10,90) size 780x18
+  RenderBlock {MARQUEE} at (0,40) size 784x22
+    RenderText {TEXT} at (2,2) size 98x18
+      text run at (2,2) width 98: "This is div two."
diff --git a/LayoutTests/fast/inline-block/003.html b/LayoutTests/fast/inline-block/003.html
new file mode 100644
index 0000000..3fbd3a4
--- /dev/null
+++ b/LayoutTests/fast/inline-block/003.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+<style>
+div{ display: inline-block; border:2px solid blue; width:300px; }
+marquee { border:2px solid green; margin: 0; white-space: normal; }
+</style>
+</head>
+<body>
+The two divs below should be on the same line, since they are display: inline-block.
+
+<center>
+<div>This is div one.</div><div>This is div two.</div>
+</center>
+
+The two marquees below should be on separate lines, since marquees fill the width of a containing
+block by default.
+
+
+<span>
+<marquee>This is div one.</marquee>
+<marquee>This is div two.</marquee>
+</span>
+
+</body>
+</html>

-- 
WebKit Debian packaging

