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

Sat Sep 26 07:53:10 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 6ba16529981f6e597ba1b5760654582479a0ef97
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 09:27:32 2003 +0000

    The most evil test I've ever come up with.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/inline-block/002-expected.txt b/LayoutTests/fast/inline-block/002-expected.txt
new file mode 100644
index 0000000..b630758
--- /dev/null
+++ b/LayoutTests/fast/inline-block/002-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x49
+  RenderBlock {HTML} at (0,0) size 800x49
+    RenderBody {BODY} at (8,8) size 784x33
+      RenderBlock (anonymous) at (0,0) size 784x17
+        RenderInline {P} at (0,0) size 462x14 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {TEXT} at (0,3) size 462x14
+            text run at (0,3) width 462: "Ahem_font_required_for_this_test."
+        RenderText {TEXT} at (0,0) size 0x0
+      RenderBlock {P} at (0,17) size 784x16
+        RenderText {TEXT} at (0,-1) size 289x16
+          text run at (0,-1) width 289: "The following two blocks should be identical."
+layer at (8,75) size 204x64
+  RenderBlock (positioned) {DIV} at (8,75) size 204x64 [bgcolor=#FFFF00]
+    RenderText {TEXT} at (0,0) size 0x0
+    RenderText {TEXT} at (0,0) size 0x0
+    RenderText {TEXT} at (0,0) size 0x0
+    RenderText {TEXT} at (0,0) size 0x0
+    RenderText {TEXT} at (0,0) size 0x0
+layer at (2,2) size 50x50 backgroundClip at (10,77) size 50x50
+  RenderBlock (positioned) {DIV} at (2,2) size 50x50 [bgcolor=#FFA500]
+layer at (152,2) size 50x50 backgroundClip at (160,77) size 50x50
+  RenderBlock (positioned) {DIV} at (152,2) size 50x50 [bgcolor=#FFA500]
+layer at (8,175) size 204x64
+  RenderBlock (positioned) {DIV} at (8,175) size 204x64 [bgcolor=#FFFF00]
+    RenderBlock (floating) {DIV} at (2,2) size 50x50 [bgcolor=#FFA500]
+    RenderText {TEXT} at (0,0) size 0x0
+    RenderBlock {DIV} at (152,2) size 50x50 [bgcolor=#FFA500]
+    RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/inline-block/002.html b/LayoutTests/fast/inline-block/002.html
new file mode 100644
index 0000000..0dd74d6
--- /dev/null
+++ b/LayoutTests/fast/inline-block/002.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+ <head>
+  <title>CSS text-indent: Hyatt's Evil Test Which Mixes Lots Of Stuff</title>
+  <style type="text/css">
+   p { font: 16px/1 serif; margin: 0; }
+   .prerequisite { display: inline; font: 1em/1 Ahem, sans-serif; background: red; color: white; }
+   .control { background-color: yellow; position: absolute; top: 75px; height: 60px; width: 200px; border: 2px solid black; }
+   .control .a { background-color: orange; position: absolute; width: 50px; height: 50px; }
+   .control .b { background-color: orange; position: absolute; left: 150px; width: 50px; height: 50px; }
+   .test { background-color: yellow; text-indent: 100px; position: absolute; top: 175px; border: 2px solid black; font: 50px/1 Ahem; }
+   .test .a { background-color: orange; width: 50px; height: 50px; float: left; }
+   .test .b { background-color: orange; display: inline-block; width: 50px; height: 50px; }
+  </style>
+ </head>
+ <body>
+  <p class="prerequisite">Ahem_font_required_for_this_test.</p>
+  <p>The following two blocks should be identical.</p>
+  <div class="control"> <!-- this should shrink wrap to the intrinsic, no-line-wrapping width -->
+   <div class="a"></div>  <!-- that's a float. -->
+   <div class="b"></div>  <!-- that's an inline-block. it should be text-indented 100px from the left edge of the float. -->
+   <!-- the inline-block should sit on top of the baseline, which should be 0.2em from the bottom of the 
+        block, since the Ahem font has a 0.2em descender. -->
+  </div>
+  <div class="test">
+   <div class="a"></div>
+   <div class="b"></div>
+  </div>
+ </body>
+</html>

-- 
WebKit Debian packaging

