[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[thakis at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1b0b3c9a96a9e97062843834be7375aab4907cd9
Author: thakis at chromium.org <thakis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 17 01:23:34 2010 +0000

    2010-07-16  Nico Weber  <thakis at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            Add chromium/win and linux expectations for fast/canvas/toDataUrl-alpha.
    
            * platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.checksum: Added.
            * platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.png: Added.
            * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.checksum: Added.
            * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.png: Added.
            * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.txt: Added.
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7fcce22..74311b6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16  Nico Weber  <thakis at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Add chromium/win and linux expectations for fast/canvas/toDataUrl-alpha.
+
+        * platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.checksum: Added.
+        * platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.png: Added.
+        * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.checksum: Added.
+        * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.png: Added.
+        * platform/chromium-win/fast/canvas/toDataURL-alpha-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+
 2010-07-16  Tony Chang  <tony at chromium.org>
 
         Not reviewed, updating test expectations.
diff --git a/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.checksum b/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.checksum
new file mode 100644
index 0000000..74c8836
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.checksum
@@ -0,0 +1 @@
+d7bfcc084d0e08a23f1d30875c5ff9b0
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.png b/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.png
new file mode 100644
index 0000000..55f751e
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/fast/canvas/toDataURL-alpha-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.checksum b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.checksum
new file mode 100644
index 0000000..078281d
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.checksum
@@ -0,0 +1 @@
+db22609d5c9495cc8c78851692f33efb
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.png b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.png
new file mode 100644
index 0000000..f4ac5f1
Binary files /dev/null and b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.txt b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.txt
new file mode 100644
index 0000000..535c21e
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/canvas/toDataURL-alpha-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x265
+  RenderBlock {HTML} at (0,0) size 800x265
+    RenderBody {BODY} at (8,16) size 784x241
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 343x19
+          text run at (0,0) width 343: "The test passes if both boxes below have the same color."
+      RenderBlock (anonymous) at (0,36) size 784x105
+        RenderHTMLCanvas {CANVAS} at (0,0) size 200x100
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,141) size 200x100
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 67b84f0..52da691 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2897,7 +2897,6 @@ BUG47826 MAC SKIP : fast/dom/HTMLMeterElement/meter-optimums.html = FAIL
 BUG47826 MAC SKIP : fast/dom/HTMLMeterElement/meter-styles.html = FAIL
 BUG47826 MAC SKIP : fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html = FAIL
 
-BUGWK42214 WIN LINUX : fast/canvas/toDataURL-alpha.html = MISSING
 
 BUGWK41311 WIN LINUX : fast/borders/border-radius-circle.html = IMAGE
 BUGWK41311 WIN LINUX : fast/borders/border-radius-groove-01.html = IMAGE

-- 
WebKit Debian packaging