[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 15:01:36 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 21f504e2bb984cc271d12ee50b38df39bde327cd
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 15:51:56 2010 +0000

    2010-10-27  Martin Robinson  <mrobinson at igalia.com>
    
            Rebaseline a couple tests after r70569.
    
            * platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt:
            * platform/gtk/fast/blockflow/self-collapsing-block-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index be4b836..8bccc09 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-27  Martin Robinson  <mrobinson at igalia.com>
+
+        Rebaseline a couple tests after r70569.
+
+        * platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt:
+        * platform/gtk/fast/blockflow/self-collapsing-block-expected.txt:
+
 2010-10-27  Adam Roben  <aroben at apple.com>
 
         Check in new Windows results for
diff --git a/LayoutTests/platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt b/LayoutTests/platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt
index 84c9672..7900a9c 100644
--- a/LayoutTests/platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt
+++ b/LayoutTests/platform/gtk/fast/blockflow/floats-in-block-layout-expected.txt
@@ -1,8 +1,8 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 300x584
+layer at (0,0) size 308x600
+  RenderBlock {HTML} at (0,0) size 116x600
+    RenderBody {BODY} at (8,8) size 100x584
       RenderBlock {DIV} at (0,0) size 100x584 [bgcolor=#FFFF00]
       RenderBlock (floating) {DIV} at (100,10) size 100x100 [bgcolor=#008000]
       RenderBlock (floating) {DIV} at (100,474) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/gtk/fast/blockflow/self-collapsing-block-expected.txt b/LayoutTests/platform/gtk/fast/blockflow/self-collapsing-block-expected.txt
index e0945a5..94dbde0 100644
--- a/LayoutTests/platform/gtk/fast/blockflow/self-collapsing-block-expected.txt
+++ b/LayoutTests/platform/gtk/fast/blockflow/self-collapsing-block-expected.txt
@@ -1,7 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
+layer at (0,0) size 316x600
+  RenderBlock {HTML} at (0,0) size 316x600
     RenderBody {BODY} at (8,8) size 300x584
       RenderBlock {DIV} at (0,0) size 100x584 [bgcolor=#008000]
       RenderBlock {DIV} at (200,0) size 0x100

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list