Diff
Modified: trunk/LayoutTests/ChangeLog (215290 => 215291)
--- trunk/LayoutTests/ChangeLog 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/ChangeLog 2017-04-12 21:11:47 UTC (rev 215291)
@@ -1,3 +1,35 @@
+2017-04-11 Dean Jackson <[email protected]>
+
+ canvas/2d.gradient.* LayoutTests failing
+ https://bugs.webkit.org/show_bug.cgi?id=170757
+ <rdar://problem/31177990>
+
+ Reviewed by Antoine Quint.
+
+ Add a fudge factor to the gradient tests, since we can
+ now produce noisy (nicer looking) gradients. There might
+ be 1 or 2 bits of difference per pixel.
+
+ * canvas/philip/tests.js:
+ (_assertPixelWithGradientNoise):
+ * canvas/philip/tests/2d.gradient.linear.transform.1.html:
+ * canvas/philip/tests/2d.gradient.linear.transform.2.html:
+ * canvas/philip/tests/2d.gradient.linear.transform.3.html:
+ * canvas/philip/tests/2d.gradient.radial.cone.bottom.html:
+ * canvas/philip/tests/2d.gradient.radial.cone.cylinder.html:
+ * canvas/philip/tests/2d.gradient.radial.cone.front.html:
+ * canvas/philip/tests/2d.gradient.radial.cone.shape1.html:
+ * canvas/philip/tests/2d.gradient.radial.cone.top.html:
+ * canvas/philip/tests/2d.gradient.radial.inside1.html:
+ * canvas/philip/tests/2d.gradient.radial.inside2.html:
+ * canvas/philip/tests/2d.gradient.radial.inside3.html:
+ * canvas/philip/tests/2d.gradient.radial.outside1.html:
+ * canvas/philip/tests/2d.gradient.radial.outside2.html:
+ * canvas/philip/tests/2d.gradient.radial.outside3.html:
+ * canvas/philip/tests/2d.gradient.radial.touch2.html:
+ * fast/canvas/script-tests/canvas-gradient-on-compositing.js:
+ * fast/canvas/canvas-gradient-on-compositing-expected.html:
+
2017-04-12 Myles C. Maxfield <[email protected]>
Well-known variations should clamp to the values listed in the @font-face block
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.1.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.1.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.1.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -20,9 +20,9 @@
ctx.fillStyle = g;
ctx.translate(-50, 0);
ctx.fillRect(50, 0, 100, 50);
-_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.2.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.2.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.2.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,9 +21,9 @@
ctx.fillStyle = g;
ctx.translate(-150, 0);
ctx.fillRect(50, 0, 100, 50);
-_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.3.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.3.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.3.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,9 +21,9 @@
ctx.fillRect(0, 0, 100, 50);
ctx.translate(-50, 0);
ctx.fillRect(50, 0, 100, 50);
-_assertPixel(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 25,25, 0,255,0,255, "25,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 75,25, 0,255,0,255, "75,25", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.bottom.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.bottom.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.bottom.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.front.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.front.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.front.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.shape1.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.shape1.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.shape1.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -30,15 +30,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.top.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.top.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.top.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside1.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside1.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside1.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside2.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside2.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside2.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside3.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside3.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside3.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -22,15 +22,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside1.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside1.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside1.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside2.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside2.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside2.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -21,15 +21,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside3.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside3.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside3.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -22,15 +22,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.touch2.html (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.touch2.html 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.touch2.html 2017-04-12 21:11:47 UTC (rev 215291)
@@ -1,3 +1,4 @@
+
<!DOCTYPE html>
<title>Canvas test: 2d.gradient.radial.touch2</title>
<script src=""
@@ -23,15 +24,15 @@
ctx.fillStyle = g;
ctx.fillRect(0, 0, 100, 50);
-_assertPixel(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
-_assertPixel(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
-_assertPixel(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
-_assertPixel(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-_assertPixel(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
-_assertPixel(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
-_assertPixel(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
-_assertPixel(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,1, 0,255,0,255, "1,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,1, 0,255,0,255, "50,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,1, 0,255,0,255, "98,1", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,25, 0,255,0,255, "1,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,25, 0,255,0,255, "98,25", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 1,48, 0,255,0,255, "1,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 50,48, 0,255,0,255, "50,48", "0,255,0,255");
+_assertPixelWithGradientNoise(canvas, 98,48, 0,255,0,255, "98,48", "0,255,0,255");
});
Modified: trunk/LayoutTests/canvas/philip/tests.js (215290 => 215291)
--- trunk/LayoutTests/canvas/philip/tests.js 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/canvas/philip/tests.js 2017-04-12 21:11:47 UTC (rev 215291)
@@ -96,6 +96,11 @@
_fail('Failed assertion: got pixel [' + c + '] at ('+x+','+y+'), expected ['+r+','+g+','+b+','+a+']');
}
+function _assertPixelWithGradientNoise(canvas, x,y, r,g,b,a, pos, colour)
+{
+ _assertPixelApprox(canvas, x, y, r, g, b, a, pos, colour, 3);
+}
+
function _assertPixelApprox(canvas, x,y, r,g,b,a, pos, colour, tolerance)
{
_asserted = true;
Modified: trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt (215290 => 215291)
--- trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt 2017-04-12 21:11:47 UTC (rev 215291)
@@ -3,8 +3,8 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS getPixel(125,50) is [0,0,0,0]
-PASS getPixel(175,50) is [0,128,0,255]
+PASS getPixel(125,50) is close to [0,0,0,0].
+PASS getPixel(175,50) is close to [0,128,0,255].
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js (215290 => 215291)
--- trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js 2017-04-12 21:08:15 UTC (rev 215290)
+++ trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js 2017-04-12 21:11:47 UTC (rev 215291)
@@ -1,5 +1,6 @@
description("Test that compositing does not influence the gradient space to context space mapping.");
var ctx = document.createElement('canvas').getContext('2d');
+const tolerance = 3;
function dataToArray(data) {
var result = new Array(data.length)
@@ -15,8 +16,13 @@
return dataToArray(data.data);
}
-function pixelShouldBe(x, y, colour) {
- shouldBe("getPixel(" + [x, y] +")", "["+colour+"]");
+function pixelShouldBeNear(x, y, colour) {
+ var c = getPixel(x, y);
+ var diff = Math.max(Math.abs(c[0]-colour[0]), Math.abs(c[1]-colour[1]), Math.abs(c[2]-colour[2]), Math.abs(c[3]-colour[3]));
+ if (diff < tolerance)
+ testPassed("getPixel(" + [x, y] + ") is close to [" + colour + "].");
+ else
+ testFailed("getPixel(" + [x, y] + ") should be close to [" + colour + "]. Was [" + c + "].");
}
var grad = ctx.createLinearGradient(100,0,200,0);
@@ -41,5 +47,5 @@
ctx.closePath();
ctx.fill();
-pixelShouldBe(125,50,[0,0,0,0]);
-pixelShouldBe(175,50,[0,128,0,255]);
+pixelShouldBeNear(125,50,[0,0,0,0]);
+pixelShouldBeNear(175,50,[0,128,0,255]);