[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit aa7fee04f5be969c02d0d169dd61b0175353db50
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 05:24:43 2010 +0000

    2010-03-11  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by David Levin.
    
            [Qt] Rebaseline the test and remove it from Skipped.
            https://bugs.webkit.org/show_bug.cgi?id=35969
    
            * platform/qt/Skipped:
            * platform/qt/fast/canvas/canvas-resize-reset-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30590db..d18c736 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-11  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by David Levin.
+
+        [Qt] Rebaseline the test and remove it from Skipped.
+        https://bugs.webkit.org/show_bug.cgi?id=35969
+
+        * platform/qt/Skipped:
+        * platform/qt/fast/canvas/canvas-resize-reset-expected.txt:
+
 2010-03-11  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 9196673..481c27e 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2455,7 +2455,6 @@ fast/box-sizing/box-sizing.html
 fast/box-sizing/panels-one.html
 fast/box-sizing/panels-two.html
 fast/canvas/canvas-incremental-repaint.html
-fast/canvas/canvas-resize-reset.html
 fast/canvas/canvas-size-change-after-layout.html
 fast/canvas/canvas-text-alignment.html
 fast/canvas/canvas-text-baseline.html
diff --git a/LayoutTests/platform/qt/fast/canvas/canvas-resize-reset-expected.txt b/LayoutTests/platform/qt/fast/canvas/canvas-resize-reset-expected.txt
index 5d366e2..94feb6e 100644
--- a/LayoutTests/platform/qt/fast/canvas/canvas-resize-reset-expected.txt
+++ b/LayoutTests/platform/qt/fast/canvas/canvas-resize-reset-expected.txt
@@ -1,10 +1,10 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x266
-  RenderBlock {HTML} at (0,0) size 800x266
-    RenderBody {BODY} at (8,14) size 784x238
-      RenderBlock {P} at (0,0) size 784x19
-        RenderText {#text} at (0,0) size 269x19
-          text run at (0,0) width 269: "There should be nothing below. Bug 8994."
-      RenderBlock {P} at (0,33) size 784x205
+layer at (0,0) size 800x272
+  RenderBlock {HTML} at (0,0) size 800x272
+    RenderBody {BODY} at (8,16) size 784x240
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 301x20
+          text run at (0,0) width 301: "There should be nothing below. Bug 8994."
+      RenderBlock {P} at (0,36) size 784x204
         RenderHTMLCanvas {CANVAS} at (0,0) size 200x200

-- 
WebKit Debian packaging