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

Sat Sep 26 07:52:38 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 41fed5854892a9c2856cfe7d499b12e6a3d802df
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 20 22:20:49 2003 +0000

    Adding an object/iframe test for padding/borders.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/frames/001-expected.txt b/LayoutTests/fast/frames/001-expected.txt
new file mode 100644
index 0000000..b0439a2
--- /dev/null
+++ b/LayoutTests/fast/frames/001-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x206
+  RenderBlock {HTML} at (0,0) size 800x206
+    RenderBody {BODY} at (8,8) size 784x190 [color=#FFFFFF] [bgcolor=#000000]
+      RenderText {TEXT} at (0,0) size 566x17
+        text run at (0,0) width 566: "The three red squares below should all look the same and be filled only with black."
+      RenderBR {BR} at (0,0) size 0x0 [bgcolor=#000000]
+      RenderText {TEXT} at (0,0) size 0x0
+      RenderPartObject {IFRAME} at (0,17) size 170x170 [bgcolor=#000000]
+        layer at (0,0) size 0x0
+          RenderCanvas at (0,0) size 0x0
+      RenderText {TEXT} at (170,173) size 4x17
+        text run at (170,173) width 4: " "
+      RenderPartObject {OBJECT} at (174,17) size 170x170 [bgcolor=#000000]
+        layer at (0,0) size 0x0
+          RenderCanvas at (0,0) size 0x0
+      RenderText {TEXT} at (344,173) size 4x17
+        text run at (344,173) width 4: " "
+      RenderPartObject {OBJECT} at (348,17) size 170x170 [bgcolor=#000000]
+        layer at (0,0) size 0x0
+          RenderCanvas at (0,0) size 0x0
+      RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/frames/001.html b/LayoutTests/fast/frames/001.html
new file mode 100644
index 0000000..beafdc1
--- /dev/null
+++ b/LayoutTests/fast/frames/001.html
@@ -0,0 +1,6 @@
+<body bgcolor=black text=white>
+The three red squares below should all look the same and be filled only with black.<br>
+<iframe style="border:10px solid red;padding:25px" width=100 height=100 src="about:blank"></iframe>
+<object style="border:10px solid red;padding:25px; width:100px; height:100px" data="about:blank"></object>
+<object style="border:10px solid red;padding:25px; width:100px; height:100px" data="about:blank"></object>
+</body>
diff --git a/LayoutTests/fast/frames/empty-frame-src-expected.txt b/LayoutTests/fast/frames/empty-frame-src-expected.txt
index 01334e5..d42b684 100644
--- a/LayoutTests/fast/frames/empty-frame-src-expected.txt
+++ b/LayoutTests/fast/frames/empty-frame-src-expected.txt
@@ -10,11 +10,11 @@ layer at (0,0) size 800x600
           RenderBlock {HTML} at (0,0) size 800x8
             RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#FF0000]
       RenderFrame {FRAME} at (0,201) size 800x197
-        layer at (0,0) size 800x197
-          RenderCanvas at (0,0) size 800x197
-        layer at (0,0) size 800x8
-          RenderBlock {HTML} at (0,0) size 800x8
-            RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#800080]
+        layer at (0,0) size 785x182
+          RenderCanvas at (0,0) size 785x182
+        layer at (0,0) size 785x8
+          RenderBlock {HTML} at (0,0) size 785x8
+            RenderBody {BODY} at (8,8) size 769x0 [bgcolor=#800080]
       RenderFrame {FRAME} at (0,402) size 800x197
         layer at (0,0) size 800x197
           RenderCanvas at (0,0) size 800x197

-- 
WebKit Debian packaging

