[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 449b264c08743fd8d010693714410f0fc1007553
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 11:50:16 2010 +0000

    2010-03-06  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Added expected results and removed the test from Skipped.
            https://bugs.webkit.org/show_bug.cgi?id=35806
    
            * platform/qt/Skipped:
            * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.checksum: Added.
            * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.png: Added.
            * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 334aa30..8bda225 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-06  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Added expected results and removed the test from Skipped.
+        https://bugs.webkit.org/show_bug.cgi?id=35806
+
+        * platform/qt/Skipped:
+        * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.checksum: Added.
+        * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.png: Added.
+        * platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.txt: Added.
+
 2010-03-05  Tony Chang  <tony at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 14b0680..03ea134 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2451,7 +2451,6 @@ fast/box-shadow/border-radius-big.html
 fast/box-sizing/box-sizing.html
 fast/box-sizing/panels-one.html
 fast/box-sizing/panels-two.html
-fast/canvas/canvasDrawingIntoSelf.html
 fast/canvas/canvas-incremental-repaint-2.html
 fast/canvas/canvas-incremental-repaint.html
 fast/canvas/canvas-resize-reset.html
diff --git a/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.checksum b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.checksum
new file mode 100644
index 0000000..4d22263
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.checksum
@@ -0,0 +1 @@
+7db69d7025f091cdd0486124ebbb810f
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.png b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.png
new file mode 100644
index 0000000..d665dd8
Binary files /dev/null and b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.txt b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.txt
new file mode 100644
index 0000000..b91f8ac
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/canvas/canvasDrawingIntoSelf-expected.txt
@@ -0,0 +1,9 @@
+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
+      RenderText {#text} at (0,184) size 490x20
+        text run at (0,184) width 490: "If this renders correctly you should see one big friendly green square. "
+      RenderHTMLCanvas {CANVAS} at (490,0) size 200x200
+      RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging