[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 690ffe820d1b749c7ad7f82af2e8e2d7d327a48b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 10:42:06 2009 +0000

    Rubber-stamped by Simon Hausmann.
    
    [Qt] http://trac.webkit.org/changeset/52194 fixed a side-effect
    of DumpRenderTree. The previously wrong expected file updated.
    
    * platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt: updated.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a7964e9..17fda4b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-16  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        [Qt] http://trac.webkit.org/changeset/52194 fixed a side-effect
+        of DumpRenderTree. The previously wrong expected file updated.
+
+        * platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt: updated.
+
 2009-12-16  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Skipping a new test, and a test that fails only on the release
diff --git a/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt b/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
index 6e0c25e..52a9b8f 100644
--- a/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1505-c524-font-var-00-b-expected.txt
@@ -4,12 +4,12 @@ layer at (0,0) size 800x88
   RenderBlock {HTML} at (0,0) size 800x88
     RenderBody {BODY} at (8,16) size 784x56
       RenderBlock {P} at (0,0) size 784x20 [color=#000080]
-        RenderText {#text} at (0,0) size 292x20
-          text run at (0,0) width 292: "This Paragraph should be in Small Caps."
+        RenderText {#text} at (0,0) size 271x20
+          text run at (0,0) width 271: "This Paragraph should be in Small Caps."
       RenderBlock {P} at (0,36) size 784x20 [color=#000080]
-        RenderText {#text} at (0,0) size 289x20
-          text run at (0,0) width 289: "This Sentence should be in Small Caps. "
-        RenderInline {SPAN} at (0,0) size 237x20
-          RenderText {#text} at (289,0) size 237x20
-            text run at (289,0) width 237: "This Sentence should be Normal."
+        RenderText {#text} at (0,0) size 266x20
+          text run at (0,0) width 266: "This Sentence should be in Small Caps. "
+        RenderInline {SPAN} at (0,0) size 222x20
+          RenderText {#text} at (266,0) size 222x20
+            text run at (266,0) width 222: "This Sentence should be Normal."
         RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging