Changeset 215291 in webkit

Timestamp:

Apr 12, 2017 2:11:47 PM (7 years ago)

Author:

dino@apple.com

Message:

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:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• canvas/philip/tests.js (modified) (1 diff)
• canvas/philip/tests/2d.gradient.linear.transform.1.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.linear.transform.2.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.linear.transform.3.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.cone.bottom.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.cone.cylinder.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.cone.front.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.cone.shape1.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.cone.top.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.inside1.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.inside2.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.inside3.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.outside1.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.outside2.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.outside3.html (modified) (1 diff)
• canvas/philip/tests/2d.gradient.radial.touch2.html (modified) (2 diffs)
• fast/canvas/canvas-gradient-on-compositing-expected.txt (modified) (1 diff)
• fast/canvas/script-tests/canvas-gradient-on-compositing.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-11  Dean Jackson  <dino@apple.com>
+
+        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  <mmaxfield@apple.com>
 

trunk/LayoutTests/canvas/philip/tests.js

@@ -97 +97 @@
 }
 
+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)
 {

trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.1.html

@@ -21 +21 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.2.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.linear.transform.3.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.bottom.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.front.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.shape1.html

@@ -31 +31 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.cone.top.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside1.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside2.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.inside3.html

@@ -23 +23 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside1.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside2.html

@@ -22 +22 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.outside3.html

@@ -23 +23 @@
 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");
 
 

trunk/LayoutTests/canvas/philip/tests/2d.gradient.radial.touch2.html

@@ +1 @@
+
 <!DOCTYPE html>
 <title>Canvas test: 2d.gradient.radial.touch2</title>
@@ -24 +25 @@
 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");
 
 

trunk/LayoutTests/fast/canvas/canvas-gradient-on-compositing-expected.txt

@@ -4 +4 @@
 
 
-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
 

trunk/LayoutTests/fast/canvas/script-tests/canvas-gradient-on-compositing.js

@@ -1 +1 @@
 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) {
@@ -16 +17 @@
 }
 
-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 + "].");
 }
 
@@ -42 +48 @@
 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]);