Bug 1082598 - Part 9: Fix test failures for Skia update. r=jrmuizel
☠☠ backed out by e6523d21523f ☠ ☠
authorLee Salzman <lsalzman@mozilla.com>
Thu, 17 Dec 2015 14:45:45 -0500
changeset 316192 8f60e42aca2eedb77a228beb4dc73b1ec104342f
parent 316191 c4297c82165f9d2645571fc15eab82fea4d3f532
child 316193 018c2a3031f42e2e53f26351d6de570f6febf7bc
push id8516
push userjlund@mozilla.com
push dateFri, 18 Dec 2015 00:52:34 +0000
reviewersjrmuizel
bugs1082598
milestone46.0a1
Bug 1082598 - Part 9: Fix test failures for Skia update. r=jrmuizel
dom/canvas/test/test_canvas.html
layout/reftests/canvas/reftest.list
layout/reftests/css-gradients/reftest.list
testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
--- a/dom/canvas/test/test_canvas.html
+++ b/dom/canvas/test/test_canvas.html
@@ -14396,22 +14396,17 @@ ctx.moveTo(50, 25);
 ctx.quadraticCurveTo(50, 25, 50, 25);
 ctx.stroke();
 
 ctx.beginPath();
 ctx.moveTo(50, 25);
 ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
 ctx.stroke();
 
-if (IsAzureSkia()) {
-  isPixel(ctx, 50,25, 0,255,0,255, 0);
-} else {
-  todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
-}
-
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
 
 }
 </script>
 
 <!-- [[[ test_2d.path.stroke.prune.line.html ]]] -->
 
 <p>Canvas test: 2d.path.stroke.prune.line</p>
 <!-- Testing: Zero-length line segments from lineTo are removed before stroking -->
@@ -14433,21 +14428,17 @@ ctx.lineWidth = 100;
 ctx.lineCap = 'round';
 ctx.lineJoin = 'round';
 
 ctx.beginPath();
 ctx.moveTo(50, 25);
 ctx.lineTo(50, 25);
 ctx.stroke();
 
-if (IsAzureSkia()) {
-  isPixel(ctx, 50,25, 0,255,0,255, 0);
-} else {
-  todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
-}
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
 
 }
 </script>
 
 <!-- [[[ test_2d.path.stroke.prune.rect.html ]]] -->
 
 <p>Canvas test: 2d.path.stroke.prune.rect</p>
 <!-- Testing: Zero-length line segments from rect and strokeRect are removed before stroking -->
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -89,17 +89,17 @@ fuzzy-if(azureSkia,9,470) random-if(Andr
 fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient-ref.html # Bug 673333
 == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum-ref.html
 
 != 693610-1.html 693610-1-notref.html # bug 693610: multiple glyph runs should not be overprinted
 
 == 726951-shadow-clips.html 726951-shadow-clips-ref.html
 
 == transformed-clip.html transformed-clip-ref.html
-== transformed-gradient.html transformed-gradient-ref.html
+fuzzy-if(azureSkia,1,15) == transformed-gradient.html transformed-gradient-ref.html
 == transformed-path.html transformed-path.html
 
 == 749467-1.html 749467-1-ref.html
 
 # You get a little bit of rounding fuzz on OSX from transforming the paths between user space and device space
 fuzzy-if(azureQuartz,2,128) fuzzy-if(d2d,12,21) fuzzy-if(d2d&&/^Windows\x20NT\x2010\.0/.test(http.oscpu),2,141) == 784573-1.html 784573-1-ref.html
 
 == 802658-1.html 802658-1-ref.html
--- a/layout/reftests/css-gradients/reftest.list
+++ b/layout/reftests/css-gradients/reftest.list
@@ -125,17 +125,17 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2b.html aja-linear-2-ref.html 
 fails == aja-linear-2c.html aja-linear-2-ref.html # bug 522607
 fails-if(!d2d) == aja-linear-2d.html aja-linear-2-ref.html # bug 526694
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3a.html aja-linear-3-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3b.html aja-linear-3-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html 
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 
+fuzzy-if(!contentSameGfxBackendAsCanvas,2,16500) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 
 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607
 skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-1.html height-dependence-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,40000) fuzzy-if(Android,6,10576) == height-dependence-2.html height-dependence-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-3.html height-dependence-3-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 
 == linear-onestopposition-1.html linear-onestopposition-1-ref.html
 fuzzy-if(d2d,47,400) == linear-onestopposition-1.html linear-onestopposition-1-ref2.html # d2d interpolates the hard stop
 == radial-onestopposition-1a.html radial-onestopposition-1-ref.html
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
@@ -1,9 +1,6 @@
 [2d.path.arcTo.shape.curve1.html]
   type: testharness
   [arcTo() curves in the right kind of shape]
     expected:
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
       if os == "mac": FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini
@@ -1,9 +1,6 @@
 [2d.path.arcTo.shape.curve2.html]
   type: testharness
   [arcTo() curves in the right kind of shape]
     expected:
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
       if os == "mac": FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
@@ -5,9 +5,11 @@
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
@@ -5,9 +5,12 @@
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
 
+
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
@@ -5,9 +5,11 @@
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL