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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dc062e95ba8189872839f5f05c16c1951607bcaf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 07:57:33 2010 +0000

    2010-03-12  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=36057
    
            * platform/qt/Skipped:
            * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.checksum: Added.
            * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.png: Added.
            * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 379992e..110c39c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-12  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=36057
+
+        * platform/qt/Skipped:
+        * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.checksum: Added.
+        * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.png: Added.
+        * platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt:
+
 2010-03-12  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index d249a50..d361fd1 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2454,7 +2454,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-size-change-after-layout.html
 fast/canvas/canvas-text-alignment.html
 fast/canvas/canvas-text-baseline.html
 fast/canvas/fillrect_gradient.html
diff --git a/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.checksum b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.checksum
new file mode 100644
index 0000000..f2629a3
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.checksum
@@ -0,0 +1 @@
+e24e1ddcae63dcbd8d08fa2d82189a33
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.png b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.png
new file mode 100644
index 0000000..033c244
Binary files /dev/null and b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt
index 5b93e42..ac8a1ae 100644
--- a/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt
+++ b/LayoutTests/platform/qt/fast/canvas/canvas-size-change-after-layout-expected.txt
@@ -3,13 +3,13 @@ layer 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
-      RenderBlock {P} at (0,0) size 784x19
-        RenderText {#text} at (0,0) size 332x19
-          text run at (0,0) width 332: "These should be two identical green hollow squares:"
-      RenderBlock (anonymous) at (0,33) size 784x61
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 373x20
+          text run at (0,0) width 373: "These should be two identical green hollow squares:"
+      RenderBlock (anonymous) at (0,36) size 784x60
         RenderHTMLCanvas {CANVAS} at (0,0) size 56x56 [border: (3px solid #008000)]
-        RenderText {#text} at (56,42) size 4x19
-          text run at (56,42) width 4: " "
+        RenderText {#text} at (56,40) size 4x20
+          text run at (56,40) width 4: " "
         RenderHTMLCanvas {CANVAS} at (60,0) size 56x56 [border: (3px solid #008000)]
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging