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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3287d49b4cc84780d4c2728bd4f2ddc24e53b183
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 17:48:29 2010 +0000

    Unreviewed. Update Qt specific expected files after r70546.
    
    * platform/qt/fast/blockflow/floats-in-block-layout-expected.txt:
    * platform/qt/fast/blockflow/self-collapsing-block-expected.txt:
    * platform/qt/fast/multicol/nested-columns-expected.checksum:
    * platform/qt/fast/multicol/nested-columns-expected.png:
    * platform/qt/fast/multicol/nested-columns-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f08bb39..dfb0d7f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-27  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed. Update Qt specific expected files after r70546.
+
+        * platform/qt/fast/blockflow/floats-in-block-layout-expected.txt:
+        * platform/qt/fast/blockflow/self-collapsing-block-expected.txt:
+        * platform/qt/fast/multicol/nested-columns-expected.checksum:
+        * platform/qt/fast/multicol/nested-columns-expected.png:
+        * platform/qt/fast/multicol/nested-columns-expected.txt:
+
 2010-10-27  Satish Sampath  <satish at chromium.org>
 
         Unreviewed, rolling out r70665.
diff --git a/LayoutTests/platform/qt/fast/blockflow/floats-in-block-layout-expected.txt b/LayoutTests/platform/qt/fast/blockflow/floats-in-block-layout-expected.txt
index 84c9672..7900a9c 100644
--- a/LayoutTests/platform/qt/fast/blockflow/floats-in-block-layout-expected.txt
+++ b/LayoutTests/platform/qt/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/qt/fast/blockflow/self-collapsing-block-expected.txt b/LayoutTests/platform/qt/fast/blockflow/self-collapsing-block-expected.txt
index e0945a5..94dbde0 100644
--- a/LayoutTests/platform/qt/fast/blockflow/self-collapsing-block-expected.txt
+++ b/LayoutTests/platform/qt/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
diff --git a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.checksum b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.checksum
index f13d00c..20a1143 100644
--- a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.checksum
+++ b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.checksum
@@ -1 +1 @@
-d6f8a71319e6040f0f95038c892f3868
\ No newline at end of file
+76faad09a2a933077c57204caa274c5b
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.png b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.png
index 358cbb4..0bb882e 100644
Binary files a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.png and b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
index 91e6784..49700d5 100644
--- a/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/qt/fast/multicol/nested-columns-expected.txt
@@ -1,7 +1,7 @@
-layer at (0,0) size 1141x600
+layer at (0,0) size 1141x584
   RenderView at (0,0) size 800x584
-layer at (0,0) size 1141x600
-  RenderBlock {HTML} at (0,0) size 800x600
+layer at (0,0) size 1141x584
+  RenderBlock {HTML} at (0,0) size 800x584
 layer at (8,8) size 1133x500
   RenderBody {BODY} at (8,8) size 750x500
     RenderBlock {H1} at (0,0) size 367x42

-- 
WebKit Debian packaging