[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d1f643a9ef9b2f2fb1721d2bf0f315f33a6767a1
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 22:04:11 2010 +0000

    Rubber-stamped by Kenneth Rohde Christiansen.
    
    Update expected results after r54441 to make buildbot happy.
    
    * platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Updated.
    * platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Updated.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d2f542a..026acf5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-05  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        Update expected results after r54441 to make buildbot happy.
+
+        * platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt: Updated.
+        * platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt: Updated.
+
 2010-02-05  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Unreviewed, missed in earlier commit.
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
index db96f36..5258a8d 100644
--- a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-advanced-expected.txt
@@ -11,8 +11,8 @@ layer at (0,0) size 865x607
             RenderBlock {HTML} at (0,0) size 350x207
               RenderBody {BODY} at (8,8) size 334x183 [bgcolor=#008000]
                 RenderBlock {P} at (0,0) size 334x40
-                  RenderText {#text} at (0,0) size 327x40
-                    text run at (0,0) width 327: "Test for frameset flattening. The flattening only"
+                  RenderText {#text} at (0,0) size 326x40
+                    text run at (0,0) width 326: "Test for frameset flattening. The flattening only"
                     text run at (0,20) width 157: "works inside the DRT."
           layer at (0,0) size 350x50
             RenderBlock (positioned) {DIV} at (0,0) size 350x50
diff --git a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
index f80eb2d..1f63c8a 100644
--- a/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
+++ b/LayoutTests/platform/qt/fast/frames/flattening/frameset-flattening-subframesets-expected.txt
@@ -14,8 +14,8 @@ layer at (0,0) size 900x630
                   RenderText {#text} at (0,0) size 399x20
                     text run at (0,0) width 399: "A frameset flattening test that only works inside the DRT."
                 RenderBlock {P} at (0,36) size 434x40
-                  RenderText {#text} at (0,0) size 425x40
-                    text run at (0,0) width 425: "This frame is inside frameset 1 and should be at least 450px"
+                  RenderText {#text} at (0,0) size 424x40
+                    text run at (0,0) width 424: "This frame is inside frameset 1 and should be at least 450px"
                     text run at (0,20) width 267: "wide, 150px tall and not be scrollable."
           layer at (0,0) size 450x50
             RenderBlock (positioned) {DIV} at (0,0) size 450x50
@@ -26,8 +26,8 @@ layer at (0,0) size 900x630
             RenderBlock {HTML} at (0,0) size 450x150
               RenderBody {BODY} at (8,8) size 434x126 [bgcolor=#FF0000]
                 RenderBlock {P} at (0,0) size 434x40
-                  RenderText {#text} at (0,0) size 425x40
-                    text run at (0,0) width 425: "This frame is inside frameset 1 and should be at least 450px"
+                  RenderText {#text} at (0,0) size 424x40
+                    text run at (0,0) width 424: "This frame is inside frameset 1 and should be at least 450px"
                     text run at (0,20) width 267: "wide, 150px tall and not be scrollable."
           layer at (0,0) size 450x150
             RenderBlock (positioned) {DIV} at (0,0) size 450x150
@@ -39,8 +39,8 @@ layer at (0,0) size 900x630
             RenderBlock {HTML} at (0,0) size 450x480
               RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#FFFF00]
                 RenderBlock {P} at (0,0) size 434x40
-                  RenderText {#text} at (0,0) size 425x40
-                    text run at (0,0) width 425: "This frame is inside frameset 2 and should be at least 450px"
+                  RenderText {#text} at (0,0) size 424x40
+                    text run at (0,0) width 424: "This frame is inside frameset 2 and should be at least 450px"
                     text run at (0,20) width 267: "wide, 400px tall and not be scrollable."
           layer at (0,0) size 200x450
             RenderBlock (positioned) {DIV} at (0,0) size 200x450
@@ -51,8 +51,8 @@ layer at (0,0) size 900x630
             RenderBlock {HTML} at (0,0) size 450x480
               RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#0000FF]
                 RenderBlock {P} at (0,0) size 434x40
-                  RenderText {#text} at (0,0) size 425x40
-                    text run at (0,0) width 425: "This frame is inside frameset 2 and should be at least 450px"
+                  RenderText {#text} at (0,0) size 424x40
+                    text run at (0,0) width 424: "This frame is inside frameset 2 and should be at least 450px"
                     text run at (0,20) width 267: "wide, 400px tall and not be scrollable."
           layer at (0,0) size 450x450
             RenderBlock (positioned) {DIV} at (0,0) size 450x450

-- 
WebKit Debian packaging