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

mdelaney at apple.com mdelaney at apple.com
Wed Dec 22 15:32:44 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit 4d539ae2f670fb1396b45d8d7edf3396c27c839d
Author: mdelaney at apple.com <mdelaney at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 02:31:57 2010 +0000

    2010-11-07  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Andreas Kling.
    
            Unskipping recently merged new philip canvas tests from SnowLeopard
            https://bugs.webkit.org/show_bug.cgi?id=49147
    
            * platform/mac-leopard/Skipped: Moving skipped test list down to leopard.
            * platform/mac-snowleopard/canvas/philip/tests/*: All new tests' expectations.
            * platform/mac/Skipped: Unskipping tests from overall mac.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 02c1d94..bc474c5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-07  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Andreas Kling.
+
+        Unskipping recently merged new philip canvas tests from SnowLeopard
+        https://bugs.webkit.org/show_bug.cgi?id=49147
+
+        * platform/mac-leopard/Skipped: Moving skipped test list down to leopard.
+        * platform/mac-snowleopard/canvas/philip/tests/*: All new tests' expectations.
+        * platform/mac/Skipped: Unskipping tests from overall mac.
+
 2010-11-07  Helder Correia  <helder at sencha.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index d89d057..21fe86c 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -160,3 +160,17 @@ canvas/philip/tests/2d.text.font.parse.system.html
 canvas/philip/tests/2d.text.measure.width.space.html
 canvas/philip/tests/toDataURL.jpeg.alpha.html
 canvas/philip/tests/type.prototype.html
+
+# Failing tests after sync with Philip Taylor's upstream tests
+canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html
+canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
+canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html
+canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
+canvas/philip/tests/2d.imageData.put.wrongtype.html
+canvas/philip/tests/2d.pattern.image.incomplete.empty.html
+canvas/philip/tests/2d.pattern.image.incomplete.omitted.html
+canvas/philip/tests/security.drawImage.canvas.html
+canvas/philip/tests/security.drawImage.image.html
+canvas/philip/tests/security.pattern.canvas.fillStyle.html
+canvas/philip/tests/security.pattern.canvas.strokeStyle.html
+canvas/philip/tests/security.reset.html
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt
new file mode 100644
index 0000000..2f994e2
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.image.incomplete.omitted-expected.txt
@@ -0,0 +1,2 @@
+Failed assertion: got pixel [255,0,0,255] at (50,25), expected [0,255,0,255] +/- 2
+
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.shadow.enable.blur-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt
new file mode 100644
index 0000000..23e075b
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.put.wrongtype-expected.txt
@@ -0,0 +1,3 @@
+Failed assertion: expected exception of type TypeError, got: Error: TYPE_MISMATCH_ERR: DOM Exception 17
+Failed assertion: expected exception of type TypeError, got: Error: TYPE_MISMATCH_ERR: DOM Exception 17
+Failed assertion: expected exception of type TypeError, got: Error: TYPE_MISMATCH_ERR: DOM Exception 17
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt
new file mode 100644
index 0000000..f2d4ac1
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.empty-expected.txt
@@ -0,0 +1,2 @@
+Failed assertion ctx.createPattern(img, 'repeat') === null (got [object CanvasPattern][object], expected [object])
+
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt
new file mode 100644
index 0000000..f2d4ac1
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.pattern.image.incomplete.omitted-expected.txt
@@ -0,0 +1,2 @@
+Failed assertion ctx.createPattern(img, 'repeat') === null (got [object CanvasPattern][object], expected [object])
+
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.canvas-expected.txt
similarity index 100%
copy from LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.canvas-expected.txt
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.image-expected.txt
similarity index 100%
copy from LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.drawImage.image-expected.txt
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
similarity index 100%
copy from LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.fillStyle-expected.txt
diff --git a/LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
similarity index 100%
copy from LayoutTests/canvas/philip/tests/security.pattern.cross-expected.txt
copy to LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.pattern.canvas.strokeStyle-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.reset-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.reset-expected.txt
new file mode 100644
index 0000000..fde8f1f
--- /dev/null
+++ b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/security.reset-expected.txt
@@ -0,0 +1,4 @@
+Blocked access to external URL http://test2.w3.org/html/tests/approved/images/yellow.png
+Failed assertion: should throw exception: canvas.toDataURL()
+Failed assertion: should throw exception: canvas.toDataURL()
+
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 74cb7c2..b063896 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -169,20 +169,6 @@ canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html
 canvas/philip/tests/2d.composite.uncovered.pattern.source-in.html
 canvas/philip/tests/2d.composite.uncovered.pattern.source-out.html
 
-# Failing tests after sync with Philip Taylor's upstream tests
-canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html
-canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
-canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html
-canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
-canvas/philip/tests/2d.imageData.put.wrongtype.html
-canvas/philip/tests/2d.pattern.image.incomplete.empty.html
-canvas/philip/tests/2d.pattern.image.incomplete.omitted.html
-canvas/philip/tests/security.drawImage.canvas.html
-canvas/philip/tests/security.drawImage.image.html
-canvas/philip/tests/security.pattern.canvas.fillStyle.html
-canvas/philip/tests/security.pattern.canvas.strokeStyle.html
-canvas/philip/tests/security.reset.html
-
 # IndexedDB is not yet enabled.
 storage/indexeddb
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list