Diff
Modified: trunk/LayoutTests/ChangeLog (222777 => 222778)
--- trunk/LayoutTests/ChangeLog 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/ChangeLog 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,3 +1,62 @@
+2017-10-03 Ms2ger <ms2...@igalia.com>
+
+ Remove some duplicated canvas toDataURL tests.
+ https://bugs.webkit.org/show_bug.cgi?id=177805
+
+ Reviewed by Youenn Fablet.
+
+ This copy of the canvas test suite was added in bug 20553 (r59954).
+ Another one-time import was done in bug 138324 (r176144). Yet another
+ copy was added in bug 148822 (r189394) and this one has been kept
+ up-to-date with upstream since.
+
+ I have verified that the latest tests cover everything the older copies
+ do. There seems to be no reason to keep the older copies around.
+
+ * TestExpectations: Removed reference to removed test.
+ * canvas/philip/tests/toDataURL.arguments.1-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.arguments.1.html: Removed.
+ * canvas/philip/tests/toDataURL.arguments.2-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.arguments.2.html: Removed.
+ * canvas/philip/tests/toDataURL.arguments.3-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.arguments.3.html: Removed.
+ * canvas/philip/tests/toDataURL.bogustype-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.bogustype.html: Removed.
+ * canvas/philip/tests/toDataURL.default-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.default.html: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.alpha-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.alpha.html: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.alpha.png: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.primarycolours-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.primarycolours.html: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.primarycolours.png: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.basic-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.basic.html: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.basic.png: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.notnumber-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.notnumber.html: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.outsiderange-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.jpeg.quality.outsiderange.html: Removed.
+ * canvas/philip/tests/toDataURL.lowercase.ascii-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.lowercase.ascii.html: Removed.
+ * canvas/philip/tests/toDataURL.lowercase.unicode-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.lowercase.unicode.html: Removed.
+ * canvas/philip/tests/toDataURL.nocontext-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.nocontext.html: Removed.
+ * canvas/philip/tests/toDataURL.png-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.png.complexcolours-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.png.complexcolours.html: Removed.
+ * canvas/philip/tests/toDataURL.png.complexcolours.png: Removed.
+ * canvas/philip/tests/toDataURL.png.html: Removed.
+ * canvas/philip/tests/toDataURL.png.primarycolours-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.png.primarycolours.html: Removed.
+ * canvas/philip/tests/toDataURL.png.primarycolours.png: Removed.
+ * canvas/philip/tests/toDataURL.unrecognised-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.unrecognised.html: Removed.
+ * canvas/philip/tests/toDataURL.zerosize-expected.txt: Removed.
+ * canvas/philip/tests/toDataURL.zerosize.html: Removed.
+ * platform/ios-device/TestExpectations: Removed reference to removed test.
+
2017-10-03 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r222760.
Modified: trunk/LayoutTests/TestExpectations (222777 => 222778)
--- trunk/LayoutTests/TestExpectations 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/TestExpectations 2017-10-03 15:41:03 UTC (rev 222778)
@@ -564,7 +564,6 @@
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.end.rtl.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.left.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.right.html [ Skip ]
-webkit.org/b/138676 imported/w3c/canvas/toDataURL.png.complexcolours.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.shadow.blur.high.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.space.collapse.nonspace.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.fontface.html [ Skip ]
@@ -573,7 +572,6 @@
webkit.org/b/138676 imported/w3c/canvas/2d.text.measure.width.basic.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.fontface.notinpage.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.coordinatespace.html [ Skip ]
-webkit.org/b/138676 imported/w3c/canvas/toDataURL.jpeg.primarycolours.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.fill.maxWidth.fontface.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.fill.maxWidth.zero.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/security.dataURI.html [ Skip ]
@@ -587,14 +585,11 @@
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.baseline.alphabetic.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.kern.consistent.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.fill.maxWidth.large.html [ Skip ]
-webkit.org/b/138676 imported/w3c/canvas/toDataURL.jpeg.alpha.html [ Skip ]
-webkit.org/b/138676 imported/w3c/canvas/toDataURL.png.primarycolours.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.shadow.blur.low.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.start.ltr.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.drawImage.animated.apng.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.start.rtl.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/2d.text.draw.align.end.ltr.html [ Skip ]
-webkit.org/b/138676 imported/w3c/canvas/toDataURL.jpeg.quality.basic.html [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/canvas_colorsandstyles_createlineargradient_001.htm [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/canvas_compositing_globalcompositeoperation_001.htm [ Skip ]
webkit.org/b/138676 imported/w3c/canvas/canvas_complexshapes_beziercurveto_001.htm [ Skip ]
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.1.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.1</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = "" 'another argument that should not raise an exception');
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.2.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.2</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = "" 'another argument that should not raise an exception', 'and another');
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.arguments.3.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.3</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// More arguments that should not raise exceptions
-var data = "" null, null, null);
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.bogustype.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.bogustype</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.default-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.default-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.default-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.default.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.default.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.default.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.default</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.alpha</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = 'rgba(128, 255, 128, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-over'; // should be ignored by toDataURL
-var data = ""
-ctx.globalCompositeOperation = 'source-over';
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- ctx.fillStyle = '#f00';
- ctx.fillRect(0, 0, 100, 50);
- var img = new Image();
- deferTest();
- img._onload_ = wrapFunction(function ()
- {
- ctx.drawImage(img, 0, 0);
-
- _assertPixelApprox(canvas, 50,25, 63,127,63,255, "50,25", "63,127,63,255", 8);
- });
- img.src = ""
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.alpha.png
(Binary files differ)
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.primarycolours</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 25, 40);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(25, 0, 50, 40);
-ctx.fillStyle = '#00f';
-ctx.fillRect(75, 0, 25, 40);
-ctx.fillStyle = '#fff';
-ctx.fillRect(0, 40, 100, 10);
-var data = "" // it is okay if this returns a PNG instead
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 0);
-
- _assertPixelApprox(canvas, 12,20, 255,255,0,255, "12,20", "255,255,0,255", 8);
- _assertPixelApprox(canvas, 50,20, 0,255,255,255, "50,20", "0,255,255,255", 8);
- _assertPixelApprox(canvas, 87,20, 0,0,255,255, "87,20", "0,0,255,255", 8);
- _assertPixelApprox(canvas, 50,45, 255,255,255,255, "50,45", "255,255,255,255", 8);
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.primarycolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.basic</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- var data_hi = canvas.toDataURL('image/jpeg', 0.99);
- var data_lo = canvas.toDataURL('image/jpeg', 0.01);
- ctx.fillStyle = '#f00';
- ctx.fillRect(0, 0, 100, 50);
- deferTest();
- var img_hi = new Image();
- img_hi._onload_ = function ()
- {
- var img_lo = new Image();
- img_lo._onload_ = wrapFunction(function ()
- {
- ctx.drawImage(img_hi, 0, 0, 50, 50, 0, 0, 50, 50);
- ctx.drawImage(img_lo, 0, 0, 50, 50, 50, 0, 50, 50);
-
- _assert(data_hi.length > data_lo.length, "data_hi.length > data_lo.length");
- _assertPixelApprox(canvas, 25,25, 0,0,255,255, "25,25", "0,0,255,255", 8);
- _assertPixelApprox(canvas, 75,25, 0,0,255,255, "75,25", "0,0,255,255", 32);
- });
- img_lo.src = ""
- };
- img_hi.src = ""
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.basic.png
(Binary files differ)
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.notnumber.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.notnumber</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- _assertSame(canvas.toDataURL('image/jpeg', 'bogus'), data, "canvas.toDataURL('image/jpeg', 'bogus')", "data");
- _assertSame(canvas.toDataURL('image/jpeg', {}), data, "canvas.toDataURL('image/jpeg', {})", "data");
- _assertSame(canvas.toDataURL('image/jpeg', null), data, "canvas.toDataURL('image/jpeg', null)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', undefined), data, "canvas.toDataURL('image/jpeg', undefined)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', true), data, "canvas.toDataURL('image/jpeg', true)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', '0.01'), data, "canvas.toDataURL('image/jpeg', '0.01')", "data");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.jpeg.quality.outsiderange.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.outsiderange</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- _assertSame(canvas.toDataURL('image/jpeg', 10), data, "canvas.toDataURL('image/jpeg', 10)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', -10), data, "canvas.toDataURL('image/jpeg', -10)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', 1.01), data, "canvas.toDataURL('image/jpeg', 1.01)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', -0.01), data, "canvas.toDataURL('image/jpeg', -0.01)", "data");
-
- _assert(canvas.toDataURL('image/jpeg', 1).length >= canvas.toDataURL('image/jpeg', 0.9).length, "canvas.toDataURL('image/jpeg', 1).length >= canvas.toDataURL('image/jpeg', 0.9).length");
- _assert(canvas.toDataURL('image/jpeg', 0).length <= canvas.toDataURL('image/jpeg', 0.1).length, "canvas.toDataURL('image/jpeg', 0).length <= canvas.toDataURL('image/jpeg', 0.1).length");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.ascii.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.lowercase.ascii</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-// If JPEG is supported at all, it must be supported case-insensitively
-data = ""
-if (data.match(/^data:image\/jpeg[;,]/)) {
- data = ""
- _assertMatch(data, /^data:image\/jpeg[;,]/, "data", "/^data:image\\/jpeg[;,]/");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.lowercase.unicode.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.lowercase.unicode</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// Use LATIN CAPITAL LETTER I WITH DOT ABOVE (Unicode lowercase is "i")
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.nocontext.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.nocontext</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var canvas2 = document.createElement('canvas');
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png.complexcolours</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// (These values are chosen to survive relatively alright through being premultiplied)
-ctx.fillStyle = 'rgba(1, 3, 254, 1)';
-ctx.fillRect(0, 0, 25, 25);
-ctx.fillStyle = 'rgba(8, 252, 248, 0.75)';
-ctx.fillRect(25, 0, 25, 25);
-ctx.fillStyle = 'rgba(6, 10, 250, 0.502)';
-ctx.fillRect(50, 0, 25, 25);
-ctx.fillStyle = 'rgba(12, 16, 244, 0.25)';
-ctx.fillRect(75, 0, 25, 25);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 25);
- // (The alpha values do not really survive float->int conversion, so just
- // do approximate comparisons)
-
- _assertPixel(canvas, 12,40, 1,3,254,255, "12,40", "1,3,254,255");
- _assertPixelApprox(canvas, 37,40, 8,252,248,191, "37,40", "8,252,248,191", 2);
- _assertPixelApprox(canvas, 62,40, 6,10,250,127, "62,40", "6,10,250,127", 4);
- _assertPixelApprox(canvas, 87,40, 12,16,244,63, "87,40", "12,16,244,63", 8);
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.complexcolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png.primarycolours</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 25, 40);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(25, 0, 50, 40);
-ctx.fillStyle = '#00f';
-ctx.fillRect(75, 0, 25, 40);
-ctx.fillStyle = '#fff';
-ctx.fillRect(0, 40, 100, 10);
-var data = ""
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 0);
-
- _assertPixel(canvas, 12,20, 255,255,0,255, "12,20", "255,255,0,255");
- _assertPixel(canvas, 50,20, 0,255,255,255, "50,20", "0,255,255,255");
- _assertPixel(canvas, 87,20, 0,0,255,255, "87,20", "0,0,255,255");
- _assertPixel(canvas, 50,45, 255,255,255,255, "50,45", "255,255,255,255");
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.png.primarycolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.unrecognised.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.unrecognised</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize-expected.txt (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize.html (222777 => 222778)
--- trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/canvas/philip/tests/toDataURL.zerosize.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.zerosize</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertSame(data, 'data:,', "data", "'data:,'");
-
-
-});
-</script>
-
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,3 +1,55 @@
+2017-10-03 Ms2ger <ms2...@igalia.com>
+
+ Remove some duplicated canvas toDataURL tests.
+ https://bugs.webkit.org/show_bug.cgi?id=177805
+
+ Reviewed by Youenn Fablet.
+
+ This copy of the canvas test suite was added in bug 138324 (r176144).
+ At that point there already was an older copy, that was added in
+ bug 20553 (r59954). A newer copy was added in bug 148822 (r189394) and
+ has been kept up-to-date with upstream since.
+
+ I have verified that the latest tests cover everything the older copies
+ do. There seems to be no reason to keep the older copies around.
+
+ * canvas/resources/toDataURL.jpeg.alpha.png: Removed.
+ * canvas/resources/toDataURL.jpeg.primarycolours.png: Removed.
+ * canvas/resources/toDataURL.jpeg.quality.basic.png: Removed.
+ * canvas/resources/toDataURL.png.complexcolours.png: Removed.
+ * canvas/resources/toDataURL.png.primarycolours.png: Removed.
+ * canvas/toDataURL.arguments.1-expected.txt: Removed.
+ * canvas/toDataURL.arguments.1.html: Removed.
+ * canvas/toDataURL.arguments.2-expected.txt: Removed.
+ * canvas/toDataURL.arguments.2.html: Removed.
+ * canvas/toDataURL.arguments.3-expected.txt: Removed.
+ * canvas/toDataURL.arguments.3.html: Removed.
+ * canvas/toDataURL.bogustype-expected.txt: Removed.
+ * canvas/toDataURL.bogustype.html: Removed.
+ * canvas/toDataURL.default-expected.txt: Removed.
+ * canvas/toDataURL.default.html: Removed.
+ * canvas/toDataURL.jpeg.alpha.html: Removed.
+ * canvas/toDataURL.jpeg.primarycolours.html: Removed.
+ * canvas/toDataURL.jpeg.quality.basic.html: Removed.
+ * canvas/toDataURL.jpeg.quality.notnumber-expected.txt: Removed.
+ * canvas/toDataURL.jpeg.quality.notnumber.html: Removed.
+ * canvas/toDataURL.jpeg.quality.outsiderange-expected.txt: Removed.
+ * canvas/toDataURL.jpeg.quality.outsiderange.html: Removed.
+ * canvas/toDataURL.lowercase.ascii-expected.txt: Removed.
+ * canvas/toDataURL.lowercase.ascii.html: Removed.
+ * canvas/toDataURL.lowercase.unicode-expected.txt: Removed.
+ * canvas/toDataURL.lowercase.unicode.html: Removed.
+ * canvas/toDataURL.nocontext-expected.txt: Removed.
+ * canvas/toDataURL.nocontext.html: Removed.
+ * canvas/toDataURL.png-expected.txt: Removed.
+ * canvas/toDataURL.png.complexcolours.html: Removed.
+ * canvas/toDataURL.png.html: Removed.
+ * canvas/toDataURL.png.primarycolours.html: Removed.
+ * canvas/toDataURL.unrecognised-expected.txt: Removed.
+ * canvas/toDataURL.unrecognised.html: Removed.
+ * canvas/toDataURL.zerosize-expected.txt: Removed.
+ * canvas/toDataURL.zerosize.html: Removed.
+
2017-10-03 Carlos Garcia Campos <cgar...@igalia.com>
W3C tests importer should not import the whole tools directory
Deleted: trunk/LayoutTests/imported/w3c/canvas/resources/toDataURL.jpeg.alpha.png
(Binary files differ)
Deleted: trunk/LayoutTests/imported/w3c/canvas/resources/toDataURL.jpeg.primarycolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/imported/w3c/canvas/resources/toDataURL.jpeg.quality.basic.png
(Binary files differ)
Deleted: trunk/LayoutTests/imported/w3c/canvas/resources/toDataURL.png.complexcolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/imported/w3c/canvas/resources/toDataURL.png.primarycolours.png
(Binary files differ)
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.arguments.1
-toDataURL ignores extra arguments
-Spec references: toDataURL.arguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.1.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.1</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL ignores extra arguments</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = "" 'another argument that should not raise an exception');
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.arguments.2
-toDataURL ignores extra arguments
-Spec references: toDataURL.arguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.2.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.2</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL ignores extra arguments</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = "" 'another argument that should not raise an exception', 'and another');
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.arguments.3
-toDataURL ignores extra arguments
-Spec references: toDataURL.arguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.arguments.3.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.arguments.3</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL ignores extra arguments</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// More arguments that should not raise exceptions
-var data = "" null, null, null);
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.bogustype
-toDataURL with a syntactically invalid type returns a PNG
-Spec references: toDataURL.unrecognised
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.bogustype.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.bogustype</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL with a syntactically invalid type returns a PNG</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.default-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.default-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.default-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.default
-toDataURL with no arguments returns a PNG
-Spec references: toDataURL.noarguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.default.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.default.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.default.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.default</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL with no arguments returns a PNG</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.alpha.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.alpha.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.alpha.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.alpha</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL with JPEG composites onto black</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = 'rgba(128, 255, 128, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-over'; // should be ignored by toDataURL
-var data = ""
-ctx.globalCompositeOperation = 'source-over';
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- ctx.fillStyle = '#f00';
- ctx.fillRect(0, 0, 100, 50);
- var img = new Image();
- deferTest();
- img._onload_ = wrapFunction(function ()
- {
- ctx.drawImage(img, 0, 0);
-
- _assertPixelApprox(canvas, 50,25, 63,127,63,255, "50,25", "63,127,63,255", 8);
- });
- img.src = ""
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.primarycolours.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.primarycolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.primarycolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.primarycolours</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL with JPEG handles simple colours correctly</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 25, 40);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(25, 0, 50, 40);
-ctx.fillStyle = '#00f';
-ctx.fillRect(75, 0, 25, 40);
-ctx.fillStyle = '#fff';
-ctx.fillRect(0, 40, 100, 10);
-var data = "" // it is okay if this returns a PNG instead
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 0);
-
- _assertPixelApprox(canvas, 12,20, 255,255,0,255, "12,20", "255,255,0,255", 8);
- _assertPixelApprox(canvas, 50,20, 0,255,255,255, "50,20", "0,255,255,255", 8);
- _assertPixelApprox(canvas, 87,20, 0,0,255,255, "87,20", "0,0,255,255", 8);
- _assertPixelApprox(canvas, 50,45, 255,255,255,255, "50,45", "255,255,255,255", 8);
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.basic.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.basic.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.basic.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.basic</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href="" href=""
-<p class="desc">toDataURL with JPEG uses the quality parameter</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- var data_hi = canvas.toDataURL('image/jpeg', 0.99);
- var data_lo = canvas.toDataURL('image/jpeg', 0.01);
- ctx.fillStyle = '#f00';
- ctx.fillRect(0, 0, 100, 50);
- deferTest();
- var img_hi = new Image();
- img_hi._onload_ = function ()
- {
- var img_lo = new Image();
- img_lo._onload_ = wrapFunction(function ()
- {
- ctx.drawImage(img_hi, 0, 0, 50, 50, 0, 0, 50, 50);
- ctx.drawImage(img_lo, 0, 0, 50, 50, 50, 0, 50, 50);
-
- _assert(data_hi.length > data_lo.length, "data_hi.length > data_lo.length");
- _assertPixelApprox(canvas, 25,25, 0,0,255,255, "25,25", "0,0,255,255", 8);
- _assertPixelApprox(canvas, 75,25, 0,0,255,255, "75,25", "0,0,255,255", 32);
- });
- img_lo.src = ""
- };
- img_hi.src = ""
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.jpeg.quality.notnumber
-toDataURL with JPEG handles non-numeric quality parameters
-Spec references: toDataURL.jpeg.nan
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.notnumber.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.notnumber</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href="" href=""
-<p class="desc">toDataURL with JPEG handles non-numeric quality parameters</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- _assertSame(canvas.toDataURL('image/jpeg', 'bogus'), data, "canvas.toDataURL('image/jpeg', 'bogus')", "data");
- _assertSame(canvas.toDataURL('image/jpeg', {}), data, "canvas.toDataURL('image/jpeg', {})", "data");
- _assertSame(canvas.toDataURL('image/jpeg', null), data, "canvas.toDataURL('image/jpeg', null)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', undefined), data, "canvas.toDataURL('image/jpeg', undefined)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', true), data, "canvas.toDataURL('image/jpeg', true)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', '0.01'), data, "canvas.toDataURL('image/jpeg', '0.01')", "data");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.jpeg.quality.outsiderange
-toDataURL with JPEG handles out-of-range quality parameters
-Spec references: toDataURL.jpeg.range
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.jpeg.quality.outsiderange.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.jpeg.quality.outsiderange</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href="" href=""
-<p class="desc">toDataURL with JPEG handles out-of-range quality parameters</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 3, 100, 1);
-// Check for JPEG support first
-var data = ""
-if (!data.match(/^data:image\/jpeg[;,]/)) {
- _assert(true, "true");
-} else {
- _assertSame(canvas.toDataURL('image/jpeg', 10), data, "canvas.toDataURL('image/jpeg', 10)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', -10), data, "canvas.toDataURL('image/jpeg', -10)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', 1.01), data, "canvas.toDataURL('image/jpeg', 1.01)", "data");
- _assertSame(canvas.toDataURL('image/jpeg', -0.01), data, "canvas.toDataURL('image/jpeg', -0.01)", "data");
-
- _assert(canvas.toDataURL('image/jpeg', 1).length >= canvas.toDataURL('image/jpeg', 0.9).length, "canvas.toDataURL('image/jpeg', 1).length >= canvas.toDataURL('image/jpeg', 0.9).length");
- _assert(canvas.toDataURL('image/jpeg', 0).length <= canvas.toDataURL('image/jpeg', 0.1).length, "canvas.toDataURL('image/jpeg', 0).length <= canvas.toDataURL('image/jpeg', 0.1).length");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.lowercase.ascii
-toDataURL type is case-insensitive
-Spec references: toDataURL.lowercase
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.ascii.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.lowercase.ascii</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL type is case-insensitive</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-// If JPEG is supported at all, it must be supported case-insensitively
-data = ""
-if (data.match(/^data:image\/jpeg[;,]/)) {
- data = ""
- _assertMatch(data, /^data:image\/jpeg[;,]/, "data", "/^data:image\\/jpeg[;,]/");
-}
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.lowercase.unicode
-toDataURL type is ASCII-case-insensitive
-Spec references: toDataURL.lowercase
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.lowercase.unicode.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.lowercase.unicode</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL type is ASCII-case-insensitive</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// Use LATIN CAPITAL LETTER I WITH DOT ABOVE (Unicode lowercase is "i")
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.nocontext
-toDataURL works before any context has been got
-Spec references: toDataURL.noarguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.nocontext.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.nocontext</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL works before any context has been got</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var canvas2 = document.createElement('canvas');
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.png-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.png-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.png-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.png
-toDataURL with image/png returns a PNG
-Spec references: toDataURL.png toDataURL.witharguments
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.complexcolours.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.complexcolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.complexcolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png.complexcolours</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL with PNG handles non-primary and non-solid colours correctly</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-// (These values are chosen to survive relatively alright through being premultiplied)
-ctx.fillStyle = 'rgba(1, 3, 254, 1)';
-ctx.fillRect(0, 0, 25, 25);
-ctx.fillStyle = 'rgba(8, 252, 248, 0.75)';
-ctx.fillRect(25, 0, 25, 25);
-ctx.fillStyle = 'rgba(6, 10, 250, 0.502)';
-ctx.fillRect(50, 0, 25, 25);
-ctx.fillStyle = 'rgba(12, 16, 244, 0.25)';
-ctx.fillRect(75, 0, 25, 25);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 25);
- // (The alpha values do not really survive float->int conversion, so just
- // do approximate comparisons)
-
- _assertPixel(canvas, 12,40, 1,3,254,255, "12,40", "1,3,254,255");
- _assertPixelApprox(canvas, 37,40, 8,252,248,191, "37,40", "8,252,248,191", 2);
- _assertPixelApprox(canvas, 62,40, 6,10,250,127, "62,40", "6,10,250,127", 4);
- _assertPixelApprox(canvas, 87,40, 12,16,244,63, "87,40", "12,16,244,63", 8);
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL with image/png returns a PNG</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.primarycolours.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.primarycolours.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.png.primarycolours.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.png.primarycolours</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href="" href=""
-<p class="desc">toDataURL with PNG handles simple colours correctly</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 25, 40);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(25, 0, 50, 40);
-ctx.fillStyle = '#00f';
-ctx.fillRect(75, 0, 25, 40);
-ctx.fillStyle = '#fff';
-ctx.fillRect(0, 40, 100, 10);
-var data = ""
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = new Image();
-deferTest();
-img._onload_ = wrapFunction(function ()
-{
- ctx.drawImage(img, 0, 0);
-
- _assertPixel(canvas, 12,20, 255,255,0,255, "12,20", "255,255,0,255");
- _assertPixel(canvas, 50,20, 0,255,255,255, "50,20", "0,255,255,255");
- _assertPixel(canvas, 87,20, 0,0,255,255, "87,20", "0,0,255,255");
- _assertPixel(canvas, 50,45, 255,255,255,255, "50,45", "255,255,255,255");
-});
-img.src = ""
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.unrecognised
-toDataURL with an unhandled type returns a PNG
-Spec references: toDataURL.unrecognised
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.unrecognised.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.unrecognised</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL with an unhandled type returns a PNG</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertMatch(data, /^data:image\/png[;,]/, "data", "/^data:image\\/png[;,]/");
-
-
-});
-</script>
-
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize-expected.txt (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize-expected.txt 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize-expected.txt 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,5 +0,0 @@
-toDataURL.zerosize
-toDataURL on zero-size canvas returns 'data:,'
-Spec references: toDataURL.zerosize
-Actual output:
-Passed
Deleted: trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize.html (222777 => 222778)
--- trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize.html 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/imported/w3c/canvas/toDataURL.zerosize.html 2017-10-03 15:41:03 UTC (rev 222778)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: toDataURL.zerosize</title>
-<meta name="author" content="Philip Taylor">
-<script src=""
-<link rel="stylesheet" href=""
-<body class="show_output">
-
-<h1><a href=""
-<p class="desc">toDataURL on zero-size canvas returns 'data:,'</p>
-
-<div class="refs">Spec references:
-<ul>
-<li><a href=""
-</ul>
-</div>
-
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var data = ""
-_assertSame(data, 'data:,', "data", "'data:,'");
-
-
-});
-</script>
-
Modified: trunk/LayoutTests/platform/ios-device/TestExpectations (222777 => 222778)
--- trunk/LayoutTests/platform/ios-device/TestExpectations 2017-10-03 15:19:01 UTC (rev 222777)
+++ trunk/LayoutTests/platform/ios-device/TestExpectations 2017-10-03 15:41:03 UTC (rev 222778)
@@ -3,8 +3,6 @@
# See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
#
-canvas/philip/tests/toDataURL.png.complexcolours.html
-
compositing/canvas/accelerated-canvas-compositing-size-limit.html [ Failure ]
compositing/canvas/accelerated-canvas-compositing.html [ Failure ]
compositing/backgrounds/fixed-backgrounds.html [ ImageOnlyFailure ]
