[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[ossy at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 599a464fded2cd39c50ac666494f08ae7bed4187
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 21:47:58 2010 +0000

    [Qt] Add platform dependent expected file because of different font size.
    
    Reviewed by Ariya Hidayat.
    
    * platform/qt/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt: Copied from LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 89b24c2..1d2b434 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Add platform dependent expected file because of different font size.
+
+        * platform/qt/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt: Copied from LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt.
+
 2010-01-18  Timothy Hatcher  <timothy at apple.com>
 
         Updated results for scroll position while zoomed.
diff --git a/LayoutTests/platform/qt/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt b/LayoutTests/platform/qt/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt
new file mode 100644
index 0000000..4e4f77c
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt
@@ -0,0 +1,11 @@
+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 784x584
+      RenderImage {IMG} at (0,0) size 100x100
+      RenderBlock {DIV} at (0,0) size 784x100
+        RenderBR {BR} at (100,0) size 0x20
+        RenderImage {IMG} at (0,100) size 100x100
+        RenderText {#text} at (0,0) size 0x0
+      RenderImage {IMG} at (100,100) size 100x100 [bgcolor=#0000FF]

-- 
WebKit Debian packaging