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

Sat Sep 26 07:53:04 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 72f5e515faf8a33dc35f0c2e7fed0be4cbcf7a73
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 02:19:44 2003 +0000

    Fix this float test.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/block/float/003-expected.txt b/LayoutTests/fast/block/float/003-expected.txt
index 65d8724..c7be0a8 100644
--- a/LayoutTests/fast/block/float/003-expected.txt
+++ b/LayoutTests/fast/block/float/003-expected.txt
@@ -1,12 +1,12 @@
-layer at (0,0) size 832x600
+layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 832x124
+layer at (0,0) size 800x124
   RenderBlock {HTML} at (0,0) size 800x124
     RenderBody {BODY} at (8,8) size 784x102
-      RenderImage {IMG} at (664,0) size 120x200 [bgcolor=#FF0000]
+      RenderBlock (floating) {DIV} at (664,0) size 120x200 [bgcolor=#FF0000]
       RenderBlock (anonymous) at (0,0) size 784x0
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {OL} at (0,0) size 824x0
+      RenderBlock {OL} at (0,0) size 664x0
       RenderBlock {P} at (0,0) size 784x102
         RenderText {TEXT} at (0,0) size 653x102
           text run at (0,0) width 628: "Vatican approves policy on sex abuse in clergy. The Vatican gave its approval Monday to the"
diff --git a/LayoutTests/fast/block/float/003.html b/LayoutTests/fast/block/float/003.html
index ac94ffd..d518f22 100644
--- a/LayoutTests/fast/block/float/003.html
+++ b/LayoutTests/fast/block/float/003.html
@@ -1,7 +1,7 @@
 <html>
 <body>
-<img style="float:right;width:120px;height:200px;background-color:red;">
-<ol style="height:0px; width:100%"></ol>
+<div style="float:right;width:120px;height:200px;background-color:red;"></div>
+<ol style="height:0px;"></ol>
 <p>
 Vatican approves policy on sex abuse in clergy.
 The Vatican gave its approval Monday to the revised U.S. bishops'

-- 
WebKit Debian packaging

