[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:27:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d0cd15be4f70759be8c1e27c1b6ac3b149386649
Author: mdelaney at apple.com <mdelaney at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 01:19:45 2010 +0000
2010-11-03 Matthew Delaney <mdelaney at apple.com>
Reviewed by Darin Adler.
Fix LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html
https://bugs.webkit.org/show_bug.cgi?id=48306
* canvas/philip/tests/2d.drawImage.incomplete.html: Modified test to correctly create an image object with its complete attr set to false.
* platform/gtk/Skipped: Unskipping now passing tests. Same for below.
* platform/mac-leopard/Skipped:
* platform/qt/Skipped:
* platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.incomplete-expected.txt: Removed old failing expectations.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71292 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9e33a55..c6dfba7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-03 Matthew Delaney <mdelaney at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fix LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html
+ https://bugs.webkit.org/show_bug.cgi?id=48306
+
+ * canvas/philip/tests/2d.drawImage.incomplete.html: Modified test to correctly create an image object with its complete attr set to false.
+ * platform/gtk/Skipped: Unskipping now passing tests. Same for below.
+ * platform/mac-leopard/Skipped:
+ * platform/qt/Skipped:
+ * platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.incomplete-expected.txt: Removed old failing expectations.
+
2010-11-03 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html b/LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html
index ac00260..a7d519f 100644
--- a/LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html
+++ b/LayoutTests/canvas/philip/tests/2d.drawImage.incomplete.html
@@ -28,6 +28,7 @@ _addTest(function(canvas, ctx) {
ctx.fillStyle = '#0f0';
ctx.fillRect(0, 0, 100, 50);
var img = new Image();
+img.src = "NotARealFileName.png";
_assertSame(img.complete, false, "img.complete", "false");
ctx.drawImage(img, 0, 0);
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index ee2a896..af0dccf 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5356,7 +5356,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
canvas/philip/tests/2d.drawImage.broken.html
-canvas/philip/tests/2d.drawImage.incomplete.html
canvas/philip/tests/2d.drawImage.null.html
canvas/philip/tests/2d.fillStyle.parse.system.html
canvas/philip/tests/2d.gradient.radial.cone.front.html
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 79b7202..d89d057 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -112,7 +112,6 @@ platform/mac/editing/spelling/move-cursor-to-beginning-of-autocorrected-word.htm
# Skipping failing philip canvas tests from http://philip.html5.org/tests/canvas/suite/tests/
canvas/philip/tests/2d.drawImage.broken.html
-canvas/philip/tests/2d.drawImage.incomplete.html
canvas/philip/tests/2d.drawImage.null.html
canvas/philip/tests/2d.fillStyle.parse.system.html
canvas/philip/tests/2d.gradient.radial.cone.front.html
diff --git a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.incomplete-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.incomplete-expected.txt
deleted file mode 100644
index e7045a9..0000000
--- a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.drawImage.incomplete-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-< [index] >
-2d.drawImage.incomplete
-References: 2d.drawImage.incomplete.image
-Actual output:
-Expected output:
-
-Failed assertion img.complete === false (got true[boolean], expected false[boolean])
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2c581ce..4c8d5c8 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5177,7 +5177,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
canvas/philip/tests/2d.drawImage.broken.html
-canvas/philip/tests/2d.drawImage.incomplete.html
canvas/philip/tests/2d.drawImage.null.html
canvas/philip/tests/2d.fillStyle.parse.system.html
canvas/philip/tests/2d.gradient.radial.cone.behind.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list